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

Linux 4.9.319

Change-Id: I00c6a4597e455519f40dac70f49b78450473ade7