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

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