mako: update to latest trinity

Change-Id: I7ec67b6683dc7a0a2a68f4cdcb7ba0774a939a0c