Merge "Use -Werror in external/bison" am: 32b7068f2f
am: 9daf3ca093

Change-Id: I959f818190a2e79558e8364423ce9c3bc388934b