Those were the last remaining raw uses of osl_inc/decrementInterlockedCount. Change-Id: I66d0d37a563106a0cc3edbd163462211893e3dae