am 2fb050b8: am 150c05fe: am 0f918878: Merge "init: Adding header guard to tokenizer"

* commit '2fb050b893d7e4e104741cd956143481d2165995':
  init: Adding header guard to tokenizer