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

diff --cc Makefile
Simple merge

diff --cc drivers/android/Kconfig
Simple merge

diff --cc drivers/gpu/drm/drm_atomic.c
Simple merge

diff --cc drivers/gpu/drm/rcar-du/rcar_du_kms.c
Simple merge

diff --cc drivers/i2c/busses/i2c-designware-platdrv.c
Simple merge

diff --cc mm/shmem.c
Simple merge

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