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