Change thread calculation to properly correct for absence of hyperthreading

Change-Id: I78dc20caaff5ca2fc46920d9bb904bb7337514d2