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

Change-Id: I20d12fe85a2b9b4877a42ce04af462a0fe15de48