Merge "Remove the X attribute from .mk files" into main am: 6bd2bd8a am:...

Merge "Remove the X attribute from .mk files" into main am: 6bd2bd8a am: 712109c1 am: 97092973 am: 5cc6f5d6

Original change: https://android-review.googlesource.com/c/platform/build/+/2654582



Change-Id: I5fbbf6a7a47306b1a35416b7be7116cbcaaf6147
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>