Merge branch 'android-4.9' into amlogic-4.9-dev

diff --cc Makefile
Simple merge

diff --cc drivers/usb/gadget/function/f_fs.c
Simple merge

diff --cc fs/block_dev.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge