Merge "Add --enable-compact-entries to aapt2 convert" into main