Merge pull request #1371 from mapbox/fix_android_build_on_linux

Get the number of CPUs correctly on Linux

Author: tmpsantos

Makefile

@@ -11,7 +11,7 @@ endif
 
 ifeq ($(shell uname -s), Linux)
 HOST = linux
-JOBS ?= $(shell sysctl -n hw.ncpu)
+JOBS ?= $(shell grep --count processor /proc/cpuinfo)
 endif
 
 JOBS ?= 1