Merge "build.config*: set KERNEL_DIR explicitly" into android-mainline