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

Change-Id: I50a3280e0fcd1dd30535c32479ca452f7f3f31f1