Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: 304562d3 am: 1156d62f Change-Id: Ib176ea5edc98f8c86ebc5774c5dc8418ffb7951e