am 68a6dcc0: am d880e1cb: am 7e8586fc: Merge "Convert to C++ Bison output"

* commit '68a6dcc0c15249617b3c8af067b9796bd80e220d':
  Convert to C++ Bison output