Merge "Camera NDK: fix typedef name"