Merge "Merge "Add public libs from an environment variable" into nyc-dev am: ea41a18c93 am: b91425132e" into nyc-mr1-dev-plus-aosp