Merge changes from topic 'parcel-v2' into mnc-dr-dev

* changes:
  Maintain Parcel ABI
  Revert "Revert "Track ashmem memory usage in Parcel""
diff --git a/include/input/Input.h b/include/input/Input.h
index 92b3d36..617175b 100644
--- a/include/input/Input.h
+++ b/include/input/Input.h
@@ -28,6 +28,7 @@
 #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.