Merge "Replace arm with proper variable for CPU/ABI"