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

Change-Id: I4a9d4dfb15d958b28cf329c5ebc0009654345fbf