Merge "Search/permit /vendor/${LIB}/hw in sphal namespace" am: afc2ac106a
am: e9e72c0a04

Change-Id: Icadbd8b97f4dd194bfbf0acf3d42c52e993b5e7f