Merge "stagefright: add null guard for CameraSource::stopCameraRecording" into nyc-dev