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

* commit '3fa68af318058751b81d4f26f71865b52266230a':
  Update Trusty related makefiles for new build system.