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