xml: fix innerxml handling of & escapes

R=r
CC=golang-dev
https://golang.org/cl/1009041
2 files changed