Merge "AAPT2: Fix long version code bugs"