Various fixes for OSS upstream sync

Summary: Fix build on Linux (on some platforms ocamlopt exists but not
ocamlc.opt).

Reviewed By: @bhosmer

Differential Revision: D1707929

Signature: t1:1707929:1417455110:18f7cbfb08c376ca3b59cabf4ac4e4a28002e866