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: f14f39b0 am: bae8a90b
Change-Id: I95ddbaf584c31deed009bb68388c25f718630f03