Merge "liblog: replace crufty min macro with existing MIN."