Merge \"Fix the definition of MACRO_LITERAL for OS X on x86-64.\"
am: ed33b7357c

Change-Id: Ida4c2fd8c2918b77c72423fdda7cd7fb52c10aab