Merge "/vendor/lib/hw is removed from search paths for vendor default ns" am: 3388af49e6 am: 17f0ae765e
am: b7d35b7d09

Change-Id: Ib638acc46f3c96ca459755a06df977799dd90822