Merge changes from topic "multi-kernel-mod-dirs" into rvc-dev am: 0917ad0467 am: 96c7390182

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

Change-Id: I28fd5dfeb0bb3848842a456decee04571262d0be