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

Change-Id: I9c0e21614e0cd0c5a0f670b03f320f3e59226e0b