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

Change-Id: I279871838884c114519a19af384e866ceb4bc7c5