Merge "Rename product_services to system_ext"