m4: add to mach-types and fix compiliation errors.

Change-Id: Ia6d8e4593c318c432db53540d20796ec39b91d84