Merge "Jarjar com.google.protobuf" into rvc-dev