Merge "Revert "Let InputFlinger create the server InputChannel""