Merge "Add system/${LIB}/vndk to default namespace for vendor." into oc-mr1-dev
am: 97d2b6d785

Change-Id: Iac6a578ea7510966cf5c87f5a7b30c8610c8d946