Merge "AAPT2: Version code major flag"