Merge branch 'android-4.9-q' of https://android.googlesource.com/kernel/common into sos-3.x

Change-Id: I0b19c129c66a9355e8564c7f3adb34b285771133
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>