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