Merge f6e09b07 ("kbuild: do not put .scmversion into the source tarball") into android-mainline

Steps on the way to 6.3-rc1

Resolves merge conflicts with:
	scripts/setlocalversion

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