Merge "Remove inputflinger from the builds."