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: 6b25213d am: e50fd48b am: 715317c4 am: 5ca292c7
Change-Id: I01f61f66bcdc94dcefdc83ec54c353b63fbdfec9