Merge "Updates for bison 3.5" am: e262086a37 am: 55bdf75af8

Change-Id: Ic1ada8bd6b96e456a657ad2e2a3d9a88dd97bbab