Fix conflicts core/jni/Android.mk core/jni/android/graphics/TextLayoutCache.cpp libs/androidfw/ResourceTypes.cpp