City of Flint says water pipe repair to be completed by August after activists demand new deadline