Merge "trusty-ut-ctrl: Make it as binary" am: 36d45bbfd5 am: c58d20321a

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

Change-Id: I2a23933fddb91556f210f8b3b9d62b681351c1a8