diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 8ef1a22aef765..e4fa7f4cacbec 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -286,10 +286,6 @@ LOCAL_CFLAGS += -Wall -Werror -Wno-error=deprecated-declarations -Wunused -Wunre
 #                        is not being compiled with that level. Remove once this has changed.
 LOCAL_CLANG_CFLAGS += -Wno-c++11-extensions
 
-# b/22414716: thread_local (android/graphics/Paint.cpp) and Clang don't like each other at the
-#             moment.
-LOCAL_CLANG := false
-
 include $(BUILD_SHARED_LIBRARY)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/core/jni/android_hardware_SensorManager.cpp b/core/jni/android_hardware_SensorManager.cpp
index e39bb1cb1a5ac..6812ab412e109 100644
--- a/core/jni/android_hardware_SensorManager.cpp
+++ b/core/jni/android_hardware_SensorManager.cpp
@@ -248,7 +248,7 @@ nativeGetDynamicSensors(JNIEnv *env, jclass clazz, jlong sensorManager, jobject
 
     mgr->getDynamicSensorList(nativeList);
 
-    ALOGI("DYNS native SensorManager.getDynamicSensorList return %d sensors", nativeList.size());
+    ALOGI("DYNS native SensorManager.getDynamicSensorList return %zu sensors", nativeList.size());
     for (size_t i = 0; i < nativeList.size(); ++i) {
         jobject sensor = translateNativeSensorToJavaSensor(env, NULL, nativeList[i]);
         // add to list
diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp
index 302cf639f4d9f..7a95cafdbb622 100644
--- a/core/jni/android_media_AudioTrack.cpp
+++ b/core/jni/android_media_AudioTrack.cpp
@@ -38,6 +38,8 @@
 #include "android_media_PlaybackParams.h"
 #include "android_media_DeviceCallback.h"
 
+#include <cinttypes>
+
 // ----------------------------------------------------------------------------
 
 using namespace android;
@@ -219,7 +221,7 @@ android_media_AudioTrack_setup(JNIEnv *env, jobject thiz, jobject weak_this, job
         jlong nativeAudioTrack) {
 
     ALOGV("sampleRates=%p, channel mask=%x, index mask=%x, audioFormat(Java)=%d, buffSize=%d"
-        "nativeAudioTrack=0x%llX",
+        "nativeAudioTrack=0x%" PRIX64,
         jSampleRate, channelPositionMask, channelIndexMask, audioFormat, buffSizeInBytes,
         nativeAudioTrack);
 
@@ -714,8 +716,8 @@ static jint android_media_AudioTrack_get_buffer_size_frames(JNIEnv *env,  jobjec
 
     ssize_t result = lpTrack->getBufferSizeInFrames();
     if (result < 0) {
-        jniThrowException(env, "java/lang/IllegalStateException",
-            "Internal error detected in getBufferSizeInFrames() = " + result);
+        jniThrowExceptionFmt(env, "java/lang/IllegalStateException",
+            "Internal error detected in getBufferSizeInFrames() = %zd", result);
         return (jint)AUDIO_JAVA_ERROR;
     }
     return (jint)result;
@@ -738,8 +740,8 @@ static jint android_media_AudioTrack_set_buffer_size_frames(JNIEnv *env,
     }
     ssize_t result = lpTrack->setBufferSizeInFrames(bufferSizeInFrames);
     if (result < 0) {
-        jniThrowException(env, "java/lang/IllegalStateException",
-            "Internal error detected in setBufferSizeInFrames() = " + result);
+        jniThrowExceptionFmt(env, "java/lang/IllegalStateException",
+            "Internal error detected in setBufferSizeInFrames() = %zd", result);
         return (jint)AUDIO_JAVA_ERROR;
     }
     return (jint)result;
diff --git a/core/jni/android_util_PathParser.cpp b/core/jni/android_util_PathParser.cpp
index 0927120f1cf5d..17e8bd836df8d 100644
--- a/core/jni/android_util_PathParser.cpp
+++ b/core/jni/android_util_PathParser.cpp
@@ -36,7 +36,7 @@ static bool parseStringForPath(JNIEnv* env, jobject, jlong skPathHandle, jstring
     PathParser::parseStringForSkPath(skPath, &result, pathString, strLength);
     env->ReleaseStringUTFChars(inputPathStr, pathString);
     if (result.failureOccurred) {
-        ALOGE(result.failureMessage.c_str());
+        ALOGE("%s", result.failureMessage.c_str());
     }
     return !result.failureOccurred;
 }
@@ -62,7 +62,7 @@ static long createPathDataFromStringPath(JNIEnv* env, jobject, jstring inputStr,
         return reinterpret_cast<jlong>(pathData);
     } else {
         delete pathData;
-        ALOGE(result.failureMessage.c_str());
+        ALOGE("%s", result.failureMessage.c_str());
         return NULL;
     }
 }
diff --git a/core/jni/android_view_DisplayEventReceiver.cpp b/core/jni/android_view_DisplayEventReceiver.cpp
index f9936aedaa5a0..8066db37d68a6 100644
--- a/core/jni/android_view_DisplayEventReceiver.cpp
+++ b/core/jni/android_view_DisplayEventReceiver.cpp
@@ -36,11 +36,6 @@
 
 namespace android {
 
-// Number of events to read at a time from the DisplayEventReceiver pipe.
-// The value should be large enough that we can quickly drain the pipe
-// using just a few large reads.
-static const size_t EVENT_BUFFER_SIZE = 100;
-
 static struct {
     jclass clazz;
 
@@ -63,7 +58,6 @@ private:
     jobject mReceiverWeakGlobal;
     sp<MessageQueue> mMessageQueue;
     DisplayEventReceiver mReceiver;
-    bool mWaitingForVsync;
 
     virtual void dispatchVsync(nsecs_t timestamp, int32_t id, uint32_t count);
     virtual void dispatchHotplug(nsecs_t timestamp, int32_t id, bool connected);
@@ -74,7 +68,7 @@ NativeDisplayEventReceiver::NativeDisplayEventReceiver(JNIEnv* env,
         jobject receiverWeak, const sp<MessageQueue>& messageQueue) :
         DisplayEventDispatcher(messageQueue->getLooper()),
         mReceiverWeakGlobal(env->NewGlobalRef(receiverWeak)),
-        mMessageQueue(messageQueue), mWaitingForVsync(false) {
+        mMessageQueue(messageQueue) {
     ALOGV("receiver %p ~ Initializing display event receiver.", this);
 }
 
diff --git a/core/jni/android_view_ThreadedRenderer.cpp b/core/jni/android_view_ThreadedRenderer.cpp
index 07868c54cf52f..68e1c96449e03 100644
--- a/core/jni/android_view_ThreadedRenderer.cpp
+++ b/core/jni/android_view_ThreadedRenderer.cpp
@@ -342,7 +342,6 @@ private:
 
     JavaVM* const mVm;
     jweak mObserverWeak;
-    jobject mJavaBufferGlobal;
 
     sp<MessageQueue> mMessageQueue;
     sp<NotifyHandler> mMessageHandler;