Android CTS 5.0 release 6
am 399e808f: Merge "Switch libxml2 to the new icu."

* commit '399e808f940777d18efe377bd34f738dc84729e0':
  Switch libxml2 to the new icu.