Merge "Fix memory leak in aapt2"