Merge "qcacmn: Converge dbglog and diag_event_log"