Merge "aapt2: disable leak detection"
am: ff044e701f

Change-Id: Ifef3bc36e361da07f45eeca466698e8416d2977f