Fix the issue with C2 cont build
Summary: Issue was introduced in D21258652. We need to make sure it compiles with opt mode. We may still have some left over py2 packages. Let's just use some format work with both.
Test Plan: ci
Reviewed By: xush6528
Differential Revision: D21457394
fbshipit-source-id: cde79a0fc6b4feba307bd9d45e1a1d4a42de9263
