Merge "Move xmlparser to under libstagefright"