Merge "AAPT2: Minor fixes to SymbolTable and diagnostic output"