Merge "Add ARM64 support to VS project generation"