Merge "trusty: utils: trusty-ut-ctrl: fix the vendor target" into main am:...

Merge "trusty: utils: trusty-ut-ctrl: fix the vendor target" into main am: eedb53cb am: 3e9a1898

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3281694



Change-Id: If1a26c78b4ee35fde2bae7292286fabb203d7710
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>