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

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