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

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