Fix cpplint errors for xmpp_message_builder.[cc|h]

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