Merge "Do not add macro min() definition for C++" am: 95eafbaf0a
am: 4a107a12e8

Change-Id: Iaef92e7bf888c0ed225cbd1f7f49acc5d832025c