Merge \\"Add support to indicate bitness of public library.\\" into nyc-mr1-dev am: 3394cd7c3c
am: 65d2b14403

Change-Id: Ia3df79243e7db36fd22a5128c7f170b6ddbc5765