Merge "Update to add bitness info to system/manifest.xml"