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

Change-Id: I3c436911116fd2dd8e23f8bcc892e4a52a08fec6