Merge "liblog: replace crufty min macro with existing MIN." am: 5cd5da9e54
am: 3bf23928fd

Change-Id: I4027f940e525a3d616e96c84fe53deffb69ee7f5