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

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