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: 5007cd55 am: 8e2be8e8 am: 37e313d3
Change-Id: Id9c353ecf3d47d8620aaecc07e42f233f68b5d55