Merge "Only skip _16k/_64k kernel modules dirs on 4K builds" into main am:...

Merge "Only skip _16k/_64k kernel modules dirs on 4K builds" into main am: 73fcd754 am: 6b38c7ed am: fe743c57 am: da860a02

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2758048



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