Merge "AAPT2: Fix order-of-destruction crash" into oc-dev