Merge "Update prebuilt shim apexes with the ones built on server"
am: c2ebb8a05a

Change-Id: I543d2d197bcb755a17d8c5a213b189c99c14acaa