Merge "Revert "Track removal of the inputflinger binary.""