Merge branch 'upstream-linux-4.4.y' into android-4.4-n