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

Change-Id: I87059bcfa09597449aaef2e2141957ea7d181ce5