Merge "trusty: fixup trusty build"
am: a42478cf3e

Change-Id: I057cf9914787c5022f937a6cc955fdaa8cb83f79