Merge "Unfold the result of output-kernel" am: df4abb043d am: 9febb4d189

Original change: https://android-review.googlesource.com/c/device/generic/common/+/2073289

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