Merge "Revert "Make the protobuf directory match closer to upstream""