Add additional vendor lib paths

Some of the vendor lib paths were removed from VNDK 28 due to no usage.
However, Vulkan team requires those vendor lib paths from vendor
section to load SPHAL libraries. To enable this, this change re-adds
addtional vendor lib paths (hw and egl) to vendor default namespace.

Bug: 170258171
Bug: 172267984
Test: atest passed

Merged-In: I85fa6fa6f61d5559c5498163302a99741f6f733f
Merged-In: Icba3ee1744b67d48241a53a147009270b0f550ca
Merged-In: Ifb0a6d2085aefb2729e3c28ab7022d38a3786a38
Change-Id: I85fa6fa6f61d5559c5498163302a99741f6f733f
(cherry picked from commit 7bbcf7ef3738c1c519381a338568faf2358f2a03)
diff --git a/contents/namespace/sphal.cc b/contents/namespace/sphal.cc
index e1f83dd..e97197f 100644
--- a/contents/namespace/sphal.cc
+++ b/contents/namespace/sphal.cc
@@ -40,6 +40,7 @@
                /*is_visible=*/true);
   ns.AddSearchPath("/odm/${LIB}", AsanPath::WITH_DATA_ASAN);
   ns.AddSearchPath("/vendor/${LIB}", AsanPath::WITH_DATA_ASAN);
+  ns.AddSearchPath("/vendor/${LIB}/egl", AsanPath::WITH_DATA_ASAN);
   ns.AddSearchPath("/vendor/${LIB}/hw", AsanPath::NONE);
 
   ns.AddPermittedPath("/odm/${LIB}", AsanPath::WITH_DATA_ASAN);
diff --git a/contents/namespace/vendordefault.cc b/contents/namespace/vendordefault.cc
index 6d56904..b3be200 100644
--- a/contents/namespace/vendordefault.cc
+++ b/contents/namespace/vendordefault.cc
@@ -92,10 +92,8 @@
         AsanPath::SAME_PATH);
   }
 
-  if (ctx.IsDefaultConfig() && GetVendorVndkVersion() == "27") {
-    ns.AddSearchPath("/vendor/${LIB}/hw", AsanPath::WITH_DATA_ASAN);
-    ns.AddSearchPath("/vendor/${LIB}/egl", AsanPath::WITH_DATA_ASAN);
-  }
+  ns.AddSearchPath("/vendor/${LIB}/hw", AsanPath::WITH_DATA_ASAN);
+  ns.AddSearchPath("/vendor/${LIB}/egl", AsanPath::WITH_DATA_ASAN);
 
   ns.AddPermittedPath("/odm", AsanPath::WITH_DATA_ASAN);
   ns.AddPermittedPath("/vendor", AsanPath::WITH_DATA_ASAN);