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

Linux 4.9.320

Change-Id: I76011669498fa30814f74984c3c24b062034ba70