Merge "DO NOT MERGE Remove inputflinger from the nyc build." into nyc-dev
am: 3ae0f24

* commit '3ae0f24dc2dd4b86505c6657c3caefd5c57e3ab9':
  DO NOT MERGE Remove inputflinger from the nyc build.

Change-Id: I5eaf73397b3749f0ea1b2092b5abb514fe5125eb