am eebc0d09: am 1038bf1d: am 94499248: Merge "Add <feature-group> tag and change aapt badging" into lmp-dev

* commit 'eebc0d090d36f8d00b841faea1bb75444963272a':
  Add <feature-group> tag and change aapt badging