Bug 886689 - Don't use OS_TEST == arm since some environments are set as armv7 etc. r=gps