Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: 466b52e296 am: c88d953406

Change-Id: I3d90a5cb2cad80add8ba0cefef4727d5c16eb96d