Fix build failure with text-2.1.2 (#161)#162

simonmar wants to merge 2 commits intofacebook:mainfacebook/Haxl:mainfrom

simonmar:issue-161simonmar/Haxl:issue-161Copy head branch name to clipboard