Merge "AAPT2: support removed_ entries in groups" into tm-dev