Man charged in Waxahachie officer's death