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

* commit 'd880e1cb0c4fa61328297cae659a7edd94e5ca83':
  Convert to C++ Bison output