Merge "Camera NDK: fix headers"