am 1691d968: am 138c540f: Merge "init: Add C++ tokenizer."

* commit '1691d968f8ae5f25036251fd5978be637bbf0b4a':
  init: Add C++ tokenizer.