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

* commit '3761365735de4cbc3c8581f0a5e972ad01f8378c':
  Fix <android-base/*.h> header guards.