diff --git a/DEPS b/DEPS
index 7292e51778c55f044610365401f20028857539ae..a43058bf909b39528b729dd3834f35b1dcabd6db 100644
--- a/DEPS
+++ b/DEPS
@@ -50,7 +50,7 @@ deps = {
    # and not have to specific specific hashes.
 
   'src/lib/ftl':
-   Var('fuchsia_git') + '/ftl' + '@' + 'be8fe290130170e78cbd3cedbf2ba580c22ced43',
+   Var('fuchsia_git') + '/ftl' + '@' + '523fd939b3e34ded3f364d9190a1ff01d1465ac7',
 
   'src/lib/tonic':
    Var('fuchsia_git') + '/tonic' + '@' + 'b590c06d2076b6c35b737fa5412f54387251588b',
diff --git a/flutter/lib/jni/dart_jni.h b/flutter/lib/jni/dart_jni.h
index bcbb2a8274f64ebc49b7c106b971290cd1e110be..0da3a0e340a991a0c8da79a7b644b31747502da9 100644
--- a/flutter/lib/jni/dart_jni.h
+++ b/flutter/lib/jni/dart_jni.h
@@ -9,17 +9,16 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_utils.h"
-#include "base/memory/ref_counted.h"
 #include "lib/tonic/dart_library_natives.h"
 #include "lib/tonic/dart_wrappable.h"
 
-#define ENTER_JNI()                                                            \
-  JNIEnv* env = base::android::AttachCurrentThread();                          \
+#define ENTER_JNI()                                   \
+  JNIEnv* env = base::android::AttachCurrentThread(); \
   base::android::ScopedJavaLocalFrame java_frame(env);
 
 namespace blink {
 
-bool CheckJniException(JNIEnv* env, Dart_Handle *exception);
+bool CheckJniException(JNIEnv* env, Dart_Handle* exception);
 bool CheckDartException(Dart_Handle result, Dart_Handle* exception);
 
 // Data cached for each Dart isolate.
@@ -37,12 +36,13 @@ class DartJni {
   static bool InitJni();
   static void OnThreadExit();
 
-  static base::android::ScopedJavaLocalRef<jclass> GetClass(
-      JNIEnv* env, const char* name);
+  static base::android::ScopedJavaLocalRef<jclass> GetClass(JNIEnv* env,
+                                                            const char* name);
 
   static std::string GetObjectClassName(JNIEnv* env, jobject obj);
 
-  static jstring DartToJavaString(JNIEnv* env, Dart_Handle dart_string,
+  static jstring DartToJavaString(JNIEnv* env,
+                                  Dart_Handle dart_string,
                                   Dart_Handle* exception);
 
   static jobject class_loader();
@@ -66,7 +66,7 @@ class JniMethodArgs {
   std::vector<jvalue> jvalues_;
 };
 
-} // namespace blink
+}  // namespace blink
 
 namespace tonic {
 
diff --git a/flutter/lib/jni/jni_api.cc b/flutter/lib/jni/jni_api.cc
index 44a63a043a42f4f7a39865cbd2a0e40611e00fd3..2d71ecf4c7a85a59352e9d089640622d092801e9 100644
--- a/flutter/lib/jni/jni_api.cc
+++ b/flutter/lib/jni/jni_api.cc
@@ -20,7 +20,7 @@ int64_t JniApi::FromReflectedField(const JniObject* field) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -36,7 +36,7 @@ int64_t JniApi::FromReflectedMethod(const JniObject* method) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
diff --git a/flutter/lib/jni/jni_array.cc b/flutter/lib/jni/jni_array.cc
index a100854af9a02047dc4026bec638d05df11bb926..ac1ff0f2963bee7d68a4cf40c59a8767731a0466 100644
--- a/flutter/lib/jni/jni_array.cc
+++ b/flutter/lib/jni/jni_array.cc
@@ -27,7 +27,7 @@ jsize JniArray::GetLength() {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -58,7 +58,7 @@ ftl::RefPtr<JniObjectArray> JniObjectArray::Create(const JniClass* clazz,
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return nullptr;
 }
 
@@ -75,7 +75,7 @@ ftl::RefPtr<JniObject> JniObjectArray::GetArrayElement(jsize index) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return nullptr;
 }
 
@@ -93,7 +93,7 @@ void JniObjectArray::SetArrayElement(jsize index, const JniObject* value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -117,7 +117,7 @@ ftl::RefPtr<JniBooleanArray> JniBooleanArray::Create(jsize length) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return nullptr;
 }
 
@@ -135,7 +135,7 @@ bool JniBooleanArray::GetArrayElement(jsize index) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return false;
 }
 
@@ -154,7 +154,7 @@ void JniBooleanArray::SetArrayElement(jsize index, bool value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -178,7 +178,7 @@ ftl::RefPtr<JniByteArray> JniByteArray::Create(jsize length) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return nullptr;
 }
 
@@ -196,7 +196,7 @@ int64_t JniByteArray::GetArrayElement(jsize index) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return false;
 }
 
@@ -214,7 +214,7 @@ void JniByteArray::SetArrayElement(jsize index, int64_t value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -238,7 +238,7 @@ ftl::RefPtr<JniCharArray> JniCharArray::Create(jsize length) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return nullptr;
 }
 
@@ -256,7 +256,7 @@ int64_t JniCharArray::GetArrayElement(jsize index) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return false;
 }
 
@@ -274,7 +274,7 @@ void JniCharArray::SetArrayElement(jsize index, int64_t value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -298,7 +298,7 @@ ftl::RefPtr<JniShortArray> JniShortArray::Create(jsize length) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return nullptr;
 }
 
@@ -316,7 +316,7 @@ int64_t JniShortArray::GetArrayElement(jsize index) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return false;
 }
 
@@ -334,7 +334,7 @@ void JniShortArray::SetArrayElement(jsize index, int64_t value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -357,7 +357,7 @@ ftl::RefPtr<JniIntArray> JniIntArray::Create(jsize length) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return nullptr;
 }
 
@@ -375,7 +375,7 @@ int64_t JniIntArray::GetArrayElement(jsize index) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return false;
 }
 
@@ -393,7 +393,7 @@ void JniIntArray::SetArrayElement(jsize index, int64_t value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -417,7 +417,7 @@ ftl::RefPtr<JniLongArray> JniLongArray::Create(jsize length) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return nullptr;
 }
 
@@ -435,7 +435,7 @@ int64_t JniLongArray::GetArrayElement(jsize index) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return false;
 }
 
@@ -453,7 +453,7 @@ void JniLongArray::SetArrayElement(jsize index, int64_t value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -477,7 +477,7 @@ ftl::RefPtr<JniFloatArray> JniFloatArray::Create(jsize length) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return nullptr;
 }
 
@@ -495,7 +495,7 @@ double JniFloatArray::GetArrayElement(jsize index) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return false;
 }
 
@@ -513,7 +513,7 @@ void JniFloatArray::SetArrayElement(jsize index, double value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -537,7 +537,7 @@ ftl::RefPtr<JniDoubleArray> JniDoubleArray::Create(jsize length) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return nullptr;
 }
 
@@ -555,7 +555,7 @@ double JniDoubleArray::GetArrayElement(jsize index) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return false;
 }
 
@@ -572,7 +572,7 @@ void JniDoubleArray::SetArrayElement(jsize index, double value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
diff --git a/flutter/lib/jni/jni_class.cc b/flutter/lib/jni/jni_class.cc
index b60a46648f55b33af27745d4cbb1945ed067b80d..1f3cf22cb8feff50c117017a91a97488610b8d1f 100644
--- a/flutter/lib/jni/jni_class.cc
+++ b/flutter/lib/jni/jni_class.cc
@@ -33,7 +33,7 @@ ftl::RefPtr<JniClass> JniClass::FromName(const char* name) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return nullptr;
 }
 
@@ -56,7 +56,7 @@ ftl::RefPtr<JniClass> JniClass::FromClassObject(const JniObject* clazz) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return nullptr;
 }
 
@@ -73,7 +73,7 @@ intptr_t JniClass::GetFieldId(const char* name, const char* sig) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -90,7 +90,7 @@ intptr_t JniClass::GetStaticFieldId(const char* name, const char* sig) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -107,7 +107,7 @@ intptr_t JniClass::GetMethodId(const char* name, const char* sig) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -124,7 +124,7 @@ intptr_t JniClass::GetStaticMethodId(const char* name, const char* sig) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -148,7 +148,7 @@ ftl::RefPtr<JniObject> JniClass::NewObject(
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return nullptr;
 }
 
@@ -165,7 +165,7 @@ bool JniClass::IsAssignable(const JniClass* clazz) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return false;
 }
 
@@ -182,7 +182,7 @@ ftl::RefPtr<JniObject> JniClass::GetStaticObjectField(jfieldID fieldId) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return nullptr;
 }
 
@@ -199,7 +199,7 @@ bool JniClass::GetStaticBooleanField(jfieldID fieldId) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return false;
 }
 
@@ -216,7 +216,7 @@ int64_t JniClass::GetStaticByteField(jfieldID fieldId) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -233,7 +233,7 @@ int64_t JniClass::GetStaticCharField(jfieldID fieldId) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -250,7 +250,7 @@ int64_t JniClass::GetStaticShortField(jfieldID fieldId) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -267,7 +267,7 @@ int64_t JniClass::GetStaticIntField(jfieldID fieldId) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -284,7 +284,7 @@ int64_t JniClass::GetStaticLongField(jfieldID fieldId) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -301,7 +301,7 @@ double JniClass::GetStaticFloatField(jfieldID fieldId) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -318,7 +318,7 @@ double JniClass::GetStaticDoubleField(jfieldID fieldId) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -336,7 +336,7 @@ void JniClass::SetStaticObjectField(jfieldID fieldId, const JniObject* value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -354,7 +354,7 @@ void JniClass::SetStaticBooleanField(jfieldID fieldId, bool value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -371,7 +371,7 @@ void JniClass::SetStaticByteField(jfieldID fieldId, int64_t value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -388,7 +388,7 @@ void JniClass::SetStaticCharField(jfieldID fieldId, int64_t value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -405,7 +405,7 @@ void JniClass::SetStaticShortField(jfieldID fieldId, int64_t value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -422,7 +422,7 @@ void JniClass::SetStaticIntField(jfieldID fieldId, int64_t value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -439,7 +439,7 @@ void JniClass::SetStaticLongField(jfieldID fieldId, int64_t value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -456,7 +456,7 @@ void JniClass::SetStaticFloatField(jfieldID fieldId, double value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -473,7 +473,7 @@ void JniClass::SetStaticDoubleField(jfieldID fieldId, double value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -498,7 +498,7 @@ ftl::RefPtr<JniObject> JniClass::CallStaticObjectMethod(
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return nullptr;
 }
 
@@ -522,7 +522,7 @@ bool JniClass::CallStaticBooleanMethod(jmethodID methodId,
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return false;
 }
 
@@ -546,7 +546,7 @@ int64_t JniClass::CallStaticByteMethod(jmethodID methodId,
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -570,7 +570,7 @@ int64_t JniClass::CallStaticCharMethod(jmethodID methodId,
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -594,7 +594,7 @@ int64_t JniClass::CallStaticShortMethod(jmethodID methodId,
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -618,7 +618,7 @@ int64_t JniClass::CallStaticIntMethod(jmethodID methodId,
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -642,7 +642,7 @@ int64_t JniClass::CallStaticLongMethod(jmethodID methodId,
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -666,7 +666,7 @@ double JniClass::CallStaticFloatMethod(jmethodID methodId,
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -690,7 +690,7 @@ double JniClass::CallStaticDoubleMethod(jmethodID methodId,
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -713,7 +713,7 @@ void JniClass::CallStaticVoidMethod(jmethodID methodId,
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
diff --git a/flutter/lib/jni/jni_object.cc b/flutter/lib/jni/jni_object.cc
index 90d2961b1732d0f19b9e715772831cff85ebcf4e..fcce672c7c24942970b8a1de41aa36c86656b821 100644
--- a/flutter/lib/jni/jni_object.cc
+++ b/flutter/lib/jni/jni_object.cc
@@ -77,7 +77,7 @@ ftl::RefPtr<JniClass> JniObject::GetObjectClass() {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return nullptr;
 }
 
@@ -94,7 +94,7 @@ ftl::RefPtr<JniObject> JniObject::GetObjectField(jfieldID fieldId) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return nullptr;
 }
 
@@ -111,7 +111,7 @@ bool JniObject::GetBooleanField(jfieldID fieldId) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return false;
 }
 
@@ -128,7 +128,7 @@ int64_t JniObject::GetByteField(jfieldID fieldId) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -145,7 +145,7 @@ int64_t JniObject::GetCharField(jfieldID fieldId) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -162,7 +162,7 @@ int64_t JniObject::GetShortField(jfieldID fieldId) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -179,7 +179,7 @@ int64_t JniObject::GetIntField(jfieldID fieldId) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -196,7 +196,7 @@ int64_t JniObject::GetLongField(jfieldID fieldId) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -213,7 +213,7 @@ double JniObject::GetFloatField(jfieldID fieldId) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -230,7 +230,7 @@ double JniObject::GetDoubleField(jfieldID fieldId) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -248,7 +248,7 @@ void JniObject::SetObjectField(jfieldID fieldId, const JniObject* value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -265,7 +265,7 @@ void JniObject::SetBooleanField(jfieldID fieldId, bool value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -282,7 +282,7 @@ void JniObject::SetByteField(jfieldID fieldId, int64_t value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -299,7 +299,7 @@ void JniObject::SetCharField(jfieldID fieldId, int64_t value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -316,7 +316,7 @@ void JniObject::SetShortField(jfieldID fieldId, int64_t value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -333,7 +333,7 @@ void JniObject::SetIntField(jfieldID fieldId, int64_t value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -350,7 +350,7 @@ void JniObject::SetLongField(jfieldID fieldId, int64_t value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -367,7 +367,7 @@ void JniObject::SetFloatField(jfieldID fieldId, double value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -384,7 +384,7 @@ void JniObject::SetDoubleField(jfieldID fieldId, double value) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
@@ -409,7 +409,7 @@ ftl::RefPtr<JniObject> JniObject::CallObjectMethod(
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return nullptr;
 }
 
@@ -433,7 +433,7 @@ bool JniObject::CallBooleanMethod(jmethodID methodId,
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return false;
 }
 
@@ -457,7 +457,7 @@ int64_t JniObject::CallByteMethod(jmethodID methodId,
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -481,7 +481,7 @@ int64_t JniObject::CallCharMethod(jmethodID methodId,
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -505,7 +505,7 @@ int64_t JniObject::CallShortMethod(jmethodID methodId,
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -529,7 +529,7 @@ int64_t JniObject::CallIntMethod(jmethodID methodId,
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -553,7 +553,7 @@ int64_t JniObject::CallLongMethod(jmethodID methodId,
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -577,7 +577,7 @@ double JniObject::CallFloatMethod(jmethodID methodId,
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -601,7 +601,7 @@ double JniObject::CallDoubleMethod(jmethodID methodId,
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return 0;
 }
 
@@ -624,7 +624,7 @@ void JniObject::CallVoidMethod(jmethodID methodId,
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return;
 }
 
diff --git a/flutter/lib/jni/jni_object.h b/flutter/lib/jni/jni_object.h
index 00532d87877ea43b3dbdf27b88f88441962bcbdb..11ea100619df6a9b7b11bee03e3debc727d6709c 100644
--- a/flutter/lib/jni/jni_object.h
+++ b/flutter/lib/jni/jni_object.h
@@ -8,7 +8,6 @@
 #include <jni.h>
 
 #include "base/android/jni_android.h"
-#include "base/memory/ref_counted.h"
 #include "lib/tonic/dart_wrappable.h"
 
 namespace blink {
diff --git a/flutter/lib/jni/jni_string.cc b/flutter/lib/jni/jni_string.cc
index 6c9789a9847c7ef90f665ddc26ff7553eb7535ca..a12d72dd246f36912e8dfa0996f481eab888d5e8 100644
--- a/flutter/lib/jni/jni_string.cc
+++ b/flutter/lib/jni/jni_string.cc
@@ -30,7 +30,7 @@ ftl::RefPtr<JniString> JniString::Create(Dart_Handle dart_string) {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return nullptr;
 }
 
@@ -54,7 +54,7 @@ Dart_Handle JniString::GetText() {
   }
 fail:
   Dart_ThrowException(exception);
-  NOTREACHED();
+  FTL_NOTREACHED();
   return Dart_Null();
 }
 
diff --git a/flutter/tonic/dart_dependency_catcher.h b/flutter/tonic/dart_dependency_catcher.h
index 73cbba21775238206e4fa6c2d41f8b95b11d84ca..740c5e2fd135ef1d99e369f9d7384f1d0f0ee065 100644
--- a/flutter/tonic/dart_dependency_catcher.h
+++ b/flutter/tonic/dart_dependency_catcher.h
@@ -7,7 +7,7 @@
 
 #include <unordered_set>
 
-#include "base/macros.h"
+#include "lib/ftl/macros.h"
 
 namespace blink {
 class DartLibraryLoader;
@@ -31,7 +31,7 @@ class DartDependencyCatcher {
   DartLibraryLoader& loader_;
   std::unordered_set<DartDependency*> dependencies_;
 
-  DISALLOW_COPY_AND_ASSIGN(DartDependencyCatcher);
+  FTL_DISALLOW_COPY_AND_ASSIGN(DartDependencyCatcher);
 };
 
 }  // namespace blink
diff --git a/flutter/tonic/dart_io.h b/flutter/tonic/dart_io.h
index 46778eeba1cd58166eec8fad299399f364ddf00a..8d3ad5283bc66bbf0ff3f74c975117a5cebb5e9d 100644
--- a/flutter/tonic/dart_io.h
+++ b/flutter/tonic/dart_io.h
@@ -5,7 +5,7 @@
 #ifndef FLUTTER_TONIC_DART_IO_H_
 #define FLUTTER_TONIC_DART_IO_H_
 
-#include "base/macros.h"
+#include "lib/ftl/macros.h"
 
 namespace blink {
 
@@ -14,7 +14,7 @@ class DartIO {
   static void InitForIsolate();
 
  private:
-  DISALLOW_IMPLICIT_CONSTRUCTORS(DartIO);
+  FTL_DISALLOW_IMPLICIT_CONSTRUCTORS(DartIO);
 };
 
 }  // namespace blink
diff --git a/sky/engine/core/script/dart_debugger.cc b/sky/engine/core/script/dart_debugger.cc
index 582ec6c929d9cbdf043307fd56136019c78a5deb..67e0d570b8bb5bfcc4d8457e50246ed03fa016fe 100644
--- a/sky/engine/core/script/dart_debugger.cc
+++ b/sky/engine/core/script/dart_debugger.cc
@@ -7,7 +7,7 @@
 #include "dart/runtime/include/dart_api.h"
 #include "dart/runtime/include/dart_native_api.h"
 #include "dart/runtime/include/dart_tools_api.h"
-
+#include "lib/ftl/logging.h"
 
 namespace blink {
 
@@ -103,8 +103,7 @@ intptr_t DartDebugger::FindIsolateIndexById(Dart_IsolateId id) {
   return FindIsolateIndexByIdLocked(id);
 }
 
-intptr_t DartDebugger::FindIsolateIndexByIdLocked(
-      Dart_IsolateId id) {
+intptr_t DartDebugger::FindIsolateIndexByIdLocked(Dart_IsolateId id) {
   lock_->AssertAcquired();
   for (size_t i = 0; i < isolates_->size(); i++) {
     if ((*isolates_)[i]->id() == id) {
@@ -130,7 +129,7 @@ void DartDebugger::RemoveIsolate(Dart_IsolateId id) {
       return;
     }
   }
-  NOTREACHED();
+  FTL_NOTREACHED();
 }
 
 base::Lock* DartDebugger::lock_ = nullptr;