Merge "Update to add bitness info to system/manifest.xml"
am: 33e9cdbe54

Change-Id: Ic7356cc092cf009ab58ea3688602742e044a0366