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