Merge remote-tracking branch 'aosp/android-4.4' into kernel-4.4

Conflicts:
	drivers/usb/core/hcd.c
	include/linux/usb.h

diff --cc arch/x86/entry/vdso/Makefile
Simple merge

diff --cc drivers/android/Kconfig
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_irq.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_pm.c
Simple merge

diff --cc drivers/media/usb/uvc/uvc_driver.c
Simple merge

diff --cc drivers/mmc/host/sdhci.c
Simple merge

diff --cc drivers/usb/core/config.c
Simple merge

diff --cc drivers/usb/core/hcd.c
Simple merge

diff --cc drivers/usb/core/hub.c
Simple merge

diff --cc fs/ext4/ext4.h
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc include/linux/usb.h
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge

diff --cc sound/pci/hda/patch_realtek.c
Simple merge