Merge "Update prebuilt shim apexes with the ones build on server" into rvc-dev