Merge "Camera: Add debug code to dump JPEG images"