Merge "diag: Add missing "get log mask" command" into msm-3.4