Merge "Refactor input code for require_kernel_config parameter" into tm-dev-plus-aosp