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

* commit 'e3b0119f79d11744a7f590510b184feef0f45894':
  AAPT: Fix resource versioning