Merge "Fixup usage of lex/yacc in Android.mk files"