Make _incremental targets work with emma_coverage=true

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index c9db22a5b67aa4a3fef38e520f4cc9cec2a240d2..8386c96058cbbeace5cd7dc986ea37fd83443aee 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1450,6 +1450,11 @@ template("android_apk") {
       has_alternative_locale_resource = true
     }
 
+    # Added emma to the target's classpath via its .build_config.
+    if (emma_coverage && !_emma_never_instrument) {
+      deps += [ "//third_party/android_tools:emma_device" ]
+    }
+
     proguard_enabled = _proguard_enabled
     if (_proguard_enabled) {
       proguard_info = "$_proguard_jar_path.info"
@@ -1676,11 +1681,6 @@ template("android_apk") {
       }
       args = [ "--inputs=@FileArg($_dex_arg_key)" ]
     }
-
-    if (emma_coverage && !_emma_never_instrument) {
-      no_locals = true
-      sources += [ "$android_sdk_root/tools/lib/emma_device.jar" ]
-    }
   }
 
   _native_libs_file_arg_dep = ":$build_config_target"