Merge "libcameraservice: missing argument when logging"