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

* commit '6214a600624d89ced651f2b4aa70815ab6672ec6':
  Update Trusty related makefiles for new build system.