am c869a51a: (-s ours) am ec8aee21: Merge "Remove inputflinger from build. DO NOT MERGE" into lmp-dev

* commit 'c869a51a4e6d58851a7aee18cb1dcb65070b87d3':
  Remove inputflinger from build. DO NOT MERGE