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

* commit 'b9904daa7892328fea10bbbab521d080f5874961':
  AAPT: Fix resource versioning