Merge "Update prebuilt shim apexes with the ones build on server" am: 3d7107a95b
am: dcf54b5e50

Change-Id: Ied211b8bd26718ac9c3f49317e07bd3b8ab8d462