am 93c63d57: merge from open-source master
am 93c63d57: merge from open-source master

Merge commit '93c63d5740cde483217fbbd2ee3c6b7223b3721f'

* commit '93c63d5740cde483217fbbd2ee3c6b7223b3721f':
  Vendorsetup needs to look in additional places.

Hybrid-Power/startsync,xorware/android_build,see4ri/lolili,RR-msm7x30/platform_manifest,knone1/platform_manifest,xorware/android_build,pranav01/platform_manifest,hagar006/platform_manifest,fallouttester/platform_manifest,xorware/android_build,xorware/android_build,ND-3500/platform_manifest,xorware/android_build