Merge "Search rs namespace prior to vndk namespace"