Merge "Adding autogenerated Trusty makefile rules" into main