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

Change-Id: Ib6997c588d034a8e232ffde92b6d056e735204b5