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

Change-Id: Iaa95dc5306c2eeb2abbc87bceede3c78a5746bcb