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

Linux 4.9.299

Change-Id: I64aedc1eb94ae8db76fa1f09d867ccb501b749af