Merge "Fix memory leak in aapt2" am: 5491eb92fc am: f26f7a206f
am: fe7f2febff

Change-Id: Idb437f74240502bf677cafca410be91bdc2fcf78