Merge "Allow vendors to extend the list of public libs"
am: dc727ef

* commit 'dc727ef1f0dc7fd9e780dfb529d02790a2c85e5a':
  Allow vendors to extend the list of public libs

Change-Id: Icfdf967fd60544065cff3bab883f6d511a2fcfd8