Merge "Remove input flinger stubs.  (DO NOT MERGE)" into klp-dev