Change-Id: Idc4533e57b7f4ddccd66b1f1a4730153064b1e27
This CL fix the checkbuild build, though I'm not sure it can create working dicttool or not. Change-Id: I5aec34a0f72441c75ac48184c0550b8e0fc40634