Shaq's son Shaqir O'Neal commits to play for father's former enemy