resolve merge conflicts of dff2a9d8 to master

Test: compile
Bug: 30465923
Change-Id: I9bcbf910e90a9160ed2fd2f75c5d72dba6ad6fcf

libs/minikin/FontCollection.cpp

@@ -20,7 +20,7 @@
 
 #include <algorithm>
 
-#include <android/log.h>
+#include <log/log.h>
 #include "unicode/unistr.h"
 #include "unicode/unorm2.h"
 

libs/minikin/FontFamily.cpp

@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <android/log.h>
+#include <log/log.h>
 #include <utils/JenkinsHash.h>
 
 #include <hb.h>

libs/minikin/FontLanguageListCache.cpp

@@ -21,7 +21,7 @@
 #include <unicode/uloc.h>
 #include <unordered_set>
 
-#include <android/log.h>
+#include <log/log.h>
 
 #include "FontLanguage.h"
 #include "MinikinInternal.h"

libs/minikin/HbFontCache.cpp

@@ -18,7 +18,7 @@
 
 #include "HbFontCache.h"
 
-#include <android/log.h>
+#include <log/log.h>
 #include <utils/LruCache.h>
 
 #include <hb.h>

libs/minikin/Layout.cpp

@@ -24,7 +24,7 @@
 #include <unicode/ubidi.h>
 #include <vector>
 
-#include <android/log.h>
+#include <log/log.h>
 #include <utils/JenkinsHash.h>
 #include <utils/LruCache.h>
 #include <utils/Singleton.h>

libs/minikin/LineBreaker.cpp

@@ -20,7 +20,7 @@
 
 #include <limits>
 
-#include <android/log.h>
+#include <log/log.h>
 
 #include <minikin/Layout.h>
 #include <minikin/LineBreaker.h>

libs/minikin/MinikinInternal.cpp

@@ -21,7 +21,7 @@
 #include "HbFontCache.h"
 #include "generated/UnicodeData.h"
 
-#include <android/log.h>
+#include <log/log.h>
 
 namespace minikin {
 

libs/minikin/SparseBitSet.cpp

@@ -19,7 +19,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#include <android/log.h>
+#include <log/log.h>
 
 #include <minikin/SparseBitSet.h>
 

tests/util/FontTestUtils.cpp

@@ -19,7 +19,7 @@
 #include <libxml/tree.h>
 #include <unistd.h>
 
-#include <android/log.h>
+#include <log/log.h>
 
 #include "FontLanguage.h"
 #include "MinikinFontForTest.h"

tests/util/MinikinFontForTest.cpp

@@ -28,7 +28,7 @@
 
 #include <string>
 
-#include <android/log.h>
+#include <log/log.h>
 
 namespace minikin {