Fix typos, thanks to Hendrik Tews.
Fix inclusion of ocambuildlib.cma in builtin-plugins.cma.