Merge "Camera NDK: fix include header"