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

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