Merge "AAPT: Fix use-after-free error" into nyc-mr1-dev am: 1031069f1d
am: ae5a79ad12

Change-Id: I8749fcefe6c98cf6609abac49b368fd2c5201eac