Merge "Update prebuilt shim apexes with the ones built on server"