[Android] Buildbot changes for EMMA code coverage

build/android/instr_action.gypi

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file is meant to be included into an action to provide a rule that
 # instruments either java class files, or jars.
 
 {
   'variables': {
     'instr_type%': 'jar',
     'input_path%': '',
     'output_path%': '',
     'stamp_path%': '',
     'extra_instr_args': [],
     'emma_jar': '<(android_sdk_root)/tools/lib/emma.jar',
     'conditions': [
       ['emma_instrument != 0', {
         'extra_instr_args': [
-          '--coverage-file=<(intermediate_dir)/coverage.em',
-          '--sources-file=<(intermediate_dir)/emma_sources.txt',
+          '--coverage-file=<(_target_name).em',
+          '--sources-file=<(_target_name)_sources.txt',
           '--sources=<(java_in_dir)/src >(additional_src_dirs) >(generated_src_dirs)',
           '--src-root=<(DEPTH)',
           '--emma-jar=<(emma_jar)',
         ],
         'conditions': [
           ['instr_type == "jar"', {
             'instr_action': 'instrument_jar',
           }, {
             'instr_action': 'instrument_classes',
           }]
@@ skipping 11 matching lines @@
   ],
   'action': [
     'python', '<(DEPTH)/build/android/gyp/emma_instr.py',
     '<(instr_action)',
     '--input-path=<(input_path)',
     '--output-path=<(output_path)',
     '--stamp=<(stamp_path)',
     '<@(extra_instr_args)',
   ]
 }