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

Change-Id: I62a4d5e4b8fa8ed4d74bd6dd28dff0ee34e96f3a