Merge "Merge "Update prebuilt CTS shim pkgs with the ones built on server"...
Merge "Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: 1fb1d686 am: 976b81fc am: a26323ff" into rvc-qpr-dev-plus-aosp am: f340eae8
Change-Id: I6c8845281f4f631cb0f40159df52260dfddfa715