Merge "[aapt2] Improve dump chunks for string pools, fix diff" into main