Merge "Mterp: Fix and restore mac host build"
am: dfcd2f43a6

* commit 'dfcd2f43a6694482a4e691261905508f65d8dc9e':
  Mterp: Fix and restore mac host build