Merge "Camera: update NDK LSC header"