Merge "Update pre-built apks in platform" into oc-mr1-dev am: 69780830e5
am: 8721e4f7ee

Change-Id: Ife918e817f5a9f26075927b74dbb83a4c1d126bc