Merge "Update Trusty related makefiles for new build system."