Merge "Update prebuilt shim apexes with the ones build on server" am: 80f6a25b99 am: 2b0ed69220
am: f30b8821e7

Change-Id: Ifb0a371b3fbcf5fa66584ee569b41b447911686c