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

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