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

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