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

Change-Id: I7d3f88862bfee00d6f4d7b4150addad7f1360e8f