Merge "Camera: update NDK header" into nyc-dev