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

Change-Id: I7d4721d3cbc966e666edb384693b44dc6cbd05a8