Merge "libjsonpb: format files"