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

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



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