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

Change-Id: Ia1a028b976dedf7d6a994bc1ce0f70045b695a1c