Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: 1fb1d686 am: 976b81fc Change-Id: I1fc2b40e98e97d576b2dd08c4e2e4e4c5332d59f