Merge "AAPT2: Fix parsing ResTable_type"