Merge "aapt2: disable leak detection" am: ff044e701f am: f9479e67d8
am: 940fec9ef3

Change-Id: I704063d1d41f5c1f961ae42c6346e70ee4e24863