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

Change-Id: I0e9d98a34088078b2f2f8d1f1eb0e0acea82267b