Merge \\"Add support to indicate bitness of public library.\\" am: 3fb358478f
am: 1b4f54e878

Change-Id: I300bb0bad0f22e0b535e04e3da5bac3872769597