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

Change-Id: I411e0e5b6ff98eaf41c350cd8c21c72065a1cbbd