Merge "AAPT: Don't crash on illegal symbol name" into lmp-dev