Merge "Rename product_services to system_ext" am: f82839906c am: 26154823bf am: fea3aaea9f
am: 329715df58

Change-Id: I4767a8901a9edea746f0f0cc83b8a98716c08601