Merge "Load modules from _16K dir when running on 16K kernel" into main am: b24f4c96

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



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