Merge "CameraJNI: Fix memory leak in stop recording." into nyc-mr1-dev