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

Change-Id: Ic2fce0e9b9769630f9a59065f317ea34201be079