Merge "Force protobuf to continue to use v51 (1.7) .class files"