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

Change-Id: Id467cc352f61c744346808af0dcc670edbcc1501