Merge "Camera: update NDK camera API headers"