Merge "Add system/manifest.xml on device" am: 569cb34dc0 am: 40517f3ea3
am: 65460a8fb9

Change-Id: I1943a06d7480363df5352d0fe88cdc6a69825153