Merge "DO NOT MERGE Remove inputflinger from the nyc build." into nyc-dev