Merge "Revert "Enable R8 by default"" am: 5006ee95fc
am: 9a6273a947

Change-Id: I3ca14e74a8e71663603a25ed68139f3e2aa84345
diff --git a/core/config.mk b/core/config.mk
index 166a371..d7e6f1e 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -546,7 +546,7 @@
 
 # Default R8 behavior when USE_R8 is not specified.
 ifndef USE_R8
-  USE_R8 := true
+  USE_R8 := false
 endif
 
 #