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

Change-Id: I156fdc5f37ff68fb84215b2a8ed13e1a17603a1f