Rename proto dependencies to include a _java component in them.

While doing this, homogenize the two dependencies on build.proto (via
build_proto and build_proto_v2) into a single build_java_proto.

--
MOS_MIGRATED_REVID=115328219
diff --git a/src/test/java/com/google/devtools/build/android/ideinfo/BUILD b/src/test/java/com/google/devtools/build/android/ideinfo/BUILD
index f268b1e..c754d9b 100644
--- a/src/test/java/com/google/devtools/build/android/ideinfo/BUILD
+++ b/src/test/java/com/google/devtools/build/android/ideinfo/BUILD
@@ -4,7 +4,7 @@
     srcs = ["PackageParserTest.java"],
     deps = [
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:package_manifest_proto",
+        "//src/main/protobuf:package_manifest_java_proto",
         "//src/tools/android/java/com/google/devtools/build/android/ideinfo:package_parser_lib",
         "//third_party:guava",
         "//third_party:jsr305",
@@ -20,7 +20,7 @@
     srcs = ["ArtifactLocationConverterTest.java"],
     deps = [
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:package_manifest_proto",
+        "//src/main/protobuf:package_manifest_java_proto",
         "//src/tools/android/java/com/google/devtools/build/android/ideinfo:package_parser_lib",
         "//third_party:guava",
         "//third_party:junit4",