am 6df21b51: am 085a6b42: am 89a3c5ad: am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev

* commit '6df21b51b118281a46cfd3c13716718040a33aea':
  AAPT: Fix regression in resource versioning