Merge "Add system/manifest.xml on device"