Revised Huang-Carter nonlocal kinetic energy functional for semiconductors and their surfaces