Merge branch 'lsk-v3.18-15.07-android-with-usb-fixup' into 'msm-3.18'

Catch msm-3.18 up with the latest Android Linaro Stable Kernel (LSK)
tag, lsk-v3.18-15.07-android. Rather than merging in tag directly,
a branch based on that tag, containing some USB fixups, is merged
instead. This avoids significant merge conflicts in USB/Gadget.

As part of the merge resolution, resolve a few trivial style/context
conflicts, and also rework the device tree Makefiles to support device
tree subdirectories (such as the 'arch/arm/boot/dts/qcom' used on
qcom/msm targets).

Conflicts:
	arch/arm/Makefile
	arch/arm/boot/dts/Makefile
	arch/arm64/Makefile
	arch/arm64/boot/dts/Makefile
	arch/arm64/include/asm/cpufeature.h
	arch/arm64/kernel/cpuinfo.c
	drivers/clk/clk.c
	include/net/route.h
	net/ipv4/route.c

Change-Id: I479d6d42d9d09d936e6fe8c376203304cf7aafbe
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>