Merge "AAPT: Add --no-version-transitions flag"