am 468fafda: am cfa966e3: Merge "Revert "Revert "Add commonly used C++ macros to libbase."""

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