Merge "Don't use path to find protoc-gen-javastream" am: 1a2a45667b

am: 1c578e8032

Change-Id: I87059bcfa09597449aaef2e2141957ea7d181ce5

Android.bp

@@ -614,11 +614,9 @@ gensrcs {
         "soong_zip",
     ],
 
-    // Append protoc-gen-javastream tool's PATH otherwise aprotoc can't find the plugin tool
-    cmd: "export PATH=$$PATH:$$(dirname $(location protoc-gen-javastream)) " +
-        "&& mkdir -p $(genDir)/$(in) " +
+    cmd: "mkdir -p $(genDir)/$(in) " +
         "&& $(location aprotoc) " +
-        "  --plugin=protoc-gen-java-stream=protoc-gen-javastream " +
+        "  --plugin=$(location protoc-gen-javastream) " +
         "  --dependency_out=$(depfile) " +
         "  --javastream_out=$(genDir)/$(in) " +
         "  -Iexternal/protobuf/src " +