Fixes for android after rebase

override cpu count provided by hwloc
for some reason it was returning 1 in android even
for multi-core cpus