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

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