Fight continues in L.A. City Hall over plan to scrap elected city attorney office