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

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

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