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

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