Merge "aapt2: disable leak detection"