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

Linux 4.9.300

Change-Id: Ie5cc683004508e9694d54795e858f904b079ca1d