Merge 4ed9c1e9 ("Merge tag 'kbuild-fixes-v6.0-2' of...

Merge 4ed9c1e9 ("Merge tag 'kbuild-fixes-v6.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild"

) into android-mainline

Steps on the way to 6.0-rc5

Resolves merge conflicts with:
	Makefile

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I884d67fb5232b49a1f0ed9c88150e335a6200546