Merge "Do not use hidden API XmlUtils."
am: 2626cc7089

Change-Id: I12ac1b92d6c0261cc6bf95ba47fc38f8053cdfe5