Merge "Fix: make vndk namespace visible for 2016 Pixes" into oc-mr1-dev