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

Change-Id: I13967aeb1c57ef196820a9f3beecd53fc490d91e