Merge "Add support to indicate bitness of public library." into nyc-mr1-dev