Merge "Only skip _16k/_64k kernel modules dirs on 4K builds" into main am: 73fcd754ee am: 6b38c7ed6f am: fe743c5704

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

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