Merge "Update prebuilt shim apexes with the ones build on server" am: adae76882c am: 3ab6ac32a2
am: 0dbd7016c0

Change-Id: I0de99c70a152106e240d5e821dd659fc3562c9f2