Merge "AAPT2: Fix order-of-destruction crash" into oc-dev am: 62b713ed73
am: 2fc8adc5fc

Change-Id: Ic723218e00e8eea1305bb47083bc056816c6f1a3