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

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