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