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

Change-Id: I64f86814a97f74e3037b3b627e7244fcbcd3af6c