Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: 304562d30b

Change-Id: I6aecd6170d5134b0dafc69ed7279acd13695839b