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

Change-Id: I374f7bbabe063421c2bb1b390f5b3cef492beb8d