am 6e812eb6: am 3fa68af3: Merge "Update Trusty related makefiles for new build system."

* commit '6e812eb67fb607cb7caa5e36f9939e672e5d6230':
  Update Trusty related makefiles for new build system.