Inferno convs2m.c

Signed-off-by: Ronald G. Minnich <rminnich@google.com>
A few tweaks for new code from Interno

Signed-off-by: Ronald G. Minnich <rminnich@google.com>