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

Change-Id: I73a727dc39e0d2be1d47afeef1305362b13ffbc4