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

* commit '150c05feeb482de2b4026fc35e392fc8c0ecd2df':
  init: Adding header guard to tokenizer