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