Detect CPU on OSX as well

Change-Id: I91720ee359230ce06a524e2f850c41da8774e2a5
Merge "Detect CPU on OSX as well"