Merge "Rename product_services to system_ext" am: b9f356f581 am: b8e68bf831
am: 165fd3916e

Change-Id: I9f279f9c8aaaff08e75a192caf11c8c07116cdd4