Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android

 Conflicts:
	arch/arm/boot/dts/Makefile
	arch/arm64/boot/dts/Makefile
	scripts/Makefile.lib

Conflict:

The android tree added some Kconfig options for building DTB-appended images
by default, including the option of specifying multiple DTBs.  This conflicted
with the backport of the upstream commits to move arm64 DTBs to vendor-specific
subdirs.

Resolution:

Gently merge the two approaches, modified the new DTB_OBJS rules in
arch/arm64/boot/Makefile to find the .dtb file in vendor specific subdirs.