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: 304562d3 am: 1156d62f am: 74f28ab7 am: 9a463784
Change-Id: I67d5a02246efd99d798fcfb7c81e2e66f72fb692