Merge "Dump XML files in aapt2 dump"