am 92ea2c90: (-s ours) Merge "Revert "DO NOT MERGE: Move translation entry point into translate.c."" into klp-dev

* commit '92ea2c903242517929aab383c23b89478b444644':
  Revert "DO NOT MERGE: Move translation entry point into translate.c."