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