Bring mako up to 4.4

Change-Id: I70a0727a51b1694cd06490fb887b800bbb74567a