Merge commit '1e4b9f3936d6f357e89360293e05a0e16d5fa440' into gingerbread-plus-aosp * commit '1e4b9f3936d6f357e89360293e05a0e16d5fa440': Remove InputConsumer, replacing with InputQueue.
Merge commit '1e4b9f3936d6f357e89360293e05a0e16d5fa440' into gingerbread-plus-aosp * commit '1e4b9f3936d6f357e89360293e05a0e16d5fa440': Remove InputConsumer, replacing with InputQueue.