am acf0a8b3: Merge "Revert "Add commonly used C++ macros to libbase.""

* commit 'acf0a8b3f632fe90132b9ce457a2237160f8cb9a':
  Revert "Add commonly used C++ macros to libbase."