Merge "AAPT: Add flag to disable versioning of vector related XML"