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

Linux 4.9.321

Change-Id: I3cf6f272a82a5ba6a8d6fdbda07dbfb4b12af5b0