Merge "Remove the X attribute from build files (2)"