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

Linux 4.9.323

Change-Id: Ib93637426d3313caad30b61f3b974978dc8fcf5f