[automerger skipped] Move XML object factory logic to libcore am: 5f6541a713 am: 4166704f6a
am: f281aed5b3  -s ours

Change-Id: I90e4f15e392d5c8e80c285d23bb0c643d14468cc