fix build
fix build

Summary:D3196321 added some tests that produced a couple more of the
redundant errors that D3211981 eliminates. Didn't do a final
rebase, my bad.

Reviewed By: samwgoldman, gabelevi

Differential Revision: D3214091

fb-gh-sync-id: 6a0be9ab7b6be277bf4dee9f394892c53e49121b
fbshipit-source-id: 6a0be9ab7b6be277bf4dee9f394892c53e49121b

samwgoldman/flow,ForbesLindesay/flow,jamesgpearce/flow,AprilArcus/flow,TiddoLangerak/flow,MichaelDeBoey/flow,chenglou/flow,mroch/flow,jamesgpearce/flow,AgentME/flow,jdelStrother/flow,gabelevi/flow,mroch/flow,ForbesLindesay/flow,fletcherw/flow,nmote/flow,jdelStrother/flow,gabelevi/flow,samwgoldman/flow,d14b3l/flow,ylu1317/flow,d14b3l/flow,popham/flow,cesarandreu/flow,nmote/flow,facebook/flow,mroch/flow,gabro/flow,jgrund/flow,mroch/flow,d14b3l/flow,TiddoLangerak/flow,AgentME/flow,fletcherw/flow,JonathanUsername/flow,MichaelDeBoey/flow,gabro/flow,claudiopro/flow,chenglou/flow,jamesgpearce/flow,chenglou/flow,mroch/flow,ForbesLindesay/flow,nmote/flow,cesarandreu/flow,chenglou/flow,ForbesLindesay/flow,jdelStrother/flow,d14b3l/flow,popham/flow,popham/flow,nmote/flow,ylu1317/flow,facebook/flow,jdelStrother/flow,jgrund/flow,JonathanUsername/flow,facebook/flow,jamesgpearce/flow,samwgoldman/flow,AprilArcus/flow,samwgoldman/flow,jdelStrother/flow,JonathanUsername/flow,JonathanUsername/flow,AprilArcus/flow,JonathanUsername/flow,jgrund/flow,claudiopro/flow,JonathanUsername/flow,popham/flow,popham/flow,AgentME/flow,nmote/flow,JonathanUsername/flow,popham/flow,mroch/flow,jeffmo/flow,gabelevi/flow,AprilArcus/flow,d14b3l/flow,gabro/flow,cesarandreu/flow,cesarandreu/flow,facebook/flow,samwgoldman/flow,AprilArcus/flow,jeffmo/flow,MichaelDeBoey/flow,chenglou/flow,TiddoLangerak/flow,claudiopro/flow,mroch/flow,gabro/flow,jamesgpearce/flow,gabro/flow,AgentME/flow,facebook/flow,fletcherw/flow,ylu1317/flow,MichaelDeBoey/flow,jeffmo/flow,claudiopro/flow,AgentME/flow,gabro/flow,TiddoLangerak/flow,samwgoldman/flow,jgrund/flow,samwgoldman/flow,chenglou/flow,fletcherw/flow,gabelevi/flow,ylu1317/flow,jeffmo/flow,ForbesLindesay/flow,jamesgpearce/flow,ylu1317/flow,TiddoLangerak/flow,AprilArcus/flow,MichaelDeBoey/flow,d14b3l/flow,jamesgpearce/flow,popham/flow,jdelStrother/flow,ForbesLindesay/flow,jeffmo/flow,claudiopro/flow,jgrund/flow,facebook/flow,jgrund/flow,facebook/flow,fletcherw/flow,gabelevi/flow,gabelevi/flow,fletcherw/flow,jeffmo/flow,gabelevi/flow,nmote/flow,nmote/flow