Merge "[aapt2] Close empty lists in "dump resources"."