Merge "trusty: fixup trusty build" am: a42478cf3e
am: 92a158a603

Change-Id: Ia8cc750f785b39a74b242bf1b9e675d6143b72eb