Merge "Update pre-built apks in platform" into oc-mr1-dev