Merge "AAPT2: Fix issue with deserializing binary XML"