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: 751c2482 am: 9f7e9051
Change-Id: I5081081ce7863ce892a2c0bf9b74d4b1ea1a1cf8