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

Change-Id: I82889a7327c9e7bedec18b4ba38826e8227815df