Make the gonk port work again
auto merge of #4316 : michaelwu/servo/fix-gonk, r=glennw

This makes the gonk port build/work again after the recent CEF port update.