reconcile mako repos to dho

Change-Id: I67a4d766bcebf6a76bf7213b9eb1d70922af6b30