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

Linux 4.9.324

Change-Id: I1e3a92e3a9108c0058d7d8e79d1ada9860b3cc34