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

Linux 4.9.304

Change-Id: I18f0deb6811bcc8fe0a8431dec2ea78318063240