Merge "Camera NDK: fix headers" am: fa87fc3b31 am: 9addb6e1b1

am: 485366ec55

Change-Id: I716a256a0320dfe65b6138b6335063789836ece3

camera/ndk/include/camera/NdkCameraCaptureSession.h

@@ -33,6 +33,7 @@
  * Do not #include files that aren't part of the NDK.
  */
 #include <sys/cdefs.h>
+#include <stdbool.h>
 
 #include <android/native_window.h>
 #include "NdkCameraError.h"

camera/ndk/include/camera/NdkCameraDevice.h

@@ -152,6 +152,11 @@ typedef struct ACameraDevice_StateCallbacks {
     ACameraDevice_ErrorStateCallback  onError;
 } ACameraDevice_StateCallbacks;
 
+/**
+ * For backward compatiblity.
+ */
+typedef ACameraDevice_StateCallbacks ACameraDevice_stateCallbacks;
+
 /**
  * Close the connection and free this ACameraDevice synchronously. Access to the ACameraDevice
  * after calling this method will cause a crash.