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

Change-Id: Ia5acc411ab374fcc06de9fefa90d273782ec869b