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

Change-Id: I4a7eed7183eb3984d1bf2127c8cc62c223b1835b