Merge "InputDispatcher: fix code for clang update"