CHROMIUM: Merge remote-tracking branch 'origin/master' into chromeos-iris

Fixes assert on input events.

BUG=b:148192668
TEST=Verify input events don't trigger assert in
    "Angry Birds 2" and "Hill Climb Racing"

Change-Id: I61046f77017a9fef0f39b9fb0ed91465905a20e1