Merge "Fix aapt2 dump xmltree not escape text nodes"