China drops charges against police in case of environmentalist's death in custody