Merge changes Ia3280936,I66d7b5eb,Ibfbb6f58

* changes:
  bison: fix glr parser on 32-bit builds.
  Re-add build files
  Replace with bison-3.5