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

Change-Id: I658bb39d0252e503677ffbb0db3d298716f33a64