mako: Update fingerprint and inheritance order

Change-Id: Ie5dec6f8b74196cff6869cc6e54f210b8b62995b