Merge "Merge "Adding autogenerated Trusty makefile rules" into main am: b093be4dee am: 57f017e75c" into udc-qpr-dev-plus-aosp