[automerger skipped] Merge "Move XML object factory logic to libcore" am: 8176fb99e1 am: 7add22db60
am: a57acd367c  -s ours

Change-Id: I7084ce472a2fce76048b02fe7f0c1672428bd207