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