Merge "Rename product_services to system_ext" am: 5ffffb4f30
am: 6069891e84

Change-Id: Id0622c213c966cfedd082bd8a93223c79beb22d4