Merge "AAPT: Fix use-after-free error" into nyc-mr1-dev