Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: ee6c47cf am: 22c8bc1c Change-Id: I78661adf1a05ff86cabeb2344b5216eea0ebf738