Merge "Fix compatibility between 'aapt2 dump' and 'aapt dump.'."