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

Change-Id: I192ef6f2cab04a10b95f30ab140a00ad11789ed2