Merge "Set arm specific variables to be empty for non-arm platforms"