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

Linux 4.9.325

Change-Id: I47e23959f5cb9f6efde2c2609eaa4e14f5efa324