Merge "AAPT2: Fix compiler error in 32-bit host test"