Merge "Remove static implementations of libtinyxml" am: bd3c8f83c2
am: c1b9f4cb12

Change-Id: Ic50513beb45420a131f21e1615fd98208dfd2309