Merge "Allow protoc-gen-javastream to build statically" am: 6afb115dea
am: 8e0b67272d

Change-Id: Ifabb5b2cbb46e18cd0c350d5bb1d6e20c202aa70