Merge "Merge "Merge "Modify to support bitness of a public library." into nougat-cts-dev am: e7b5222ceb  -s ours" into nougat-mr1-cts-dev am: 926ba40a18"