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

Change-Id: Id286c8a584f001a57ae942229b8b218e0203df86