Merge "Update prebuilt CTS shim pkgs with the ones built on server" into...
Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: 466b52e2 am: c88d9534 am: a6bfd338 am: ff4ce9ed
Change-Id: Ia2539770cf001f63777974c3fbe1942b0167ba69