Merge remote-tracking branch 'aosp/android-4.9-q' into int/11/fp3

Linux 4.9.313

Change-Id: Ic376396ba60623ff3519eb1c3ba93fdef676c2c4