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

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