Merge "Search rs namespace prior to vndk namespace"
am: 5ccb6a5cdc

Change-Id: I646ddc21e3965ffe3d9926a3c774d941291e5f5f