Merge "AAPT2: Bump version number to v2.18"