Merge "Fix the tag size in token of ProtoOutputStream.cpp, the java version has the correct tag size computed."