Merge "Fix 'kernel_config' error." am: e19ee04dd6 am: feccaa3297

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1714398

Change-Id: Ic220f58bc79038dc4dd16b1776f5ba7c62c19f23