o removed RefBase usages o ifdef for TARGET_USES_ION Change-Id: Ief331f4c847b86be0e37d24983097af1f53234a2