Merge tag 'v4.4.48' into android-4.4.y

This is the 4.4.48 stable release

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

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge