Merge change 1910 into donut

* changes:
  Update aapt badging for native code, configs, density, etc.