Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: ee6c47cf am: 0e39f5f0 Change-Id: I5193f38e4ca38bdf688bfe53cc744912c4fefddc