resolve merge conflicts of 834ac204ce to klp-modular-dev.

Bug: 23905002
Change-Id: Ic7262861af91a8fff27692c0f68761cb3ab12aa3

diff --cc include/input/Input.h
index fba5845,f8075e4..df6921a
--- 1/include/input/Input.h
--- 2/include/input/Input.h
+++ b/include/input/Input.h
@@@ -22,12 -22,12 +22,13 @@@
   */
  
  #include <android/input.h>
 -#include <utils/Vector.h>
 +#include <utils/BitSet.h>
  #include <utils/KeyedVector.h>
 -#include <utils/Timers.h>
  #include <utils/RefBase.h>
  #include <utils/String8.h>
 +#include <utils/Timers.h>
 +#include <utils/Vector.h>
+ #include <stdint.h>
  
  /*
   * Additional private constants not defined in ndk/ui/input.h.