Merge "Rename product_services to system_ext"
am: f82839906c

Change-Id: I65794f5107d9192a1560a975060e722111d99a37