Fix cpplint errors for message_builder.[cc|h]

Change-Id: Id5808788d92420d4982ef1693afede8d5fa959bf
Merge "Fix cpplint errors for message_builder.[cc|h]"