Merge "vendor apk is unbundled" into oc-mr1-dev