Merge "Remove the manifest.xml from the shared device.mk" into pi-dev