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

* commit '392b1cc2a2bea1c908e8e948d88c8ce07a40d032':

Change-Id: Ic9ca24f9202d61ba2f782d21e9a281b3976912bb