Oakland mayor announces $2.5M more, upgrades for beleaguered 911 system