Merge "edify: update for bison 3.5" am: 1477c867f7 am: 1dccf9c474

Change-Id: Ieccbcd941d6cf811628a33c81175ecf8b3c48b12