Merge "Move XML object factory logic to libcore" am: 8176fb99e1
am: 7add22db60

Change-Id: If395891203fae0a8b55f8f58430adc979b758db2