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

Change-Id: I42800574019cc23a44246e2afde273e7b7dd13fa