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

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

Change-Id: I68877bbfcc70b86bcd922a1e1e986e97f7d78fea