Merge "Add <feature-group> tag and change aapt badging" into lmp-dev