Merge "Suppress the unused variable warning in parser.yy" am: b9b03a282b
am: 05c111b90b

Change-Id: I111bdd2b72dd4ae04e7c6bcb020621fdc77915b7