am a5c9d829: am 7fa83d26: am b9904daa: am 15724ffc: am e3b0119f: Merge "AAPT: Fix resource versioning" into mnc-dev

* commit 'a5c9d829ce9e84d4a4322fc96259ba333d41f336':
  AAPT: Fix resource versioning