GitLab

Android instrumentation tests and gtests cannot be separated at mb
so we pass '--coverage-dir' to both if any coverage turned on
and tackle it at runner side for '--coverage-dir'.

Also changed 'java_coverage' to 'use_java_coverage' to be consistent.

Bug: 985574
Change-Id: Ia3d99f07292b49714196e3c296d3234420bee0ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1876492
Commit-Queue: Yun Liu <yliuyliu@google.com>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#708880}