Merge "Fix <android-base/*.h> header guards." am: 3761365
am: 9c965d7

* commit '9c965d74e5877a64c2f658af1398d9597f61c90a':
  Fix <android-base/*.h> header guards.