Merge "Remove the X attribute from .mk files" into main