Rerun make_macros.sh. clang-format has changed a little. This is a semantic no-op but it makes the diff in the next change smaller. Change-Id: Ia492a81340a868b888d619a1c7740d1a86845e92