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