Merge "AAPT2: Delete dead code"