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

Change-Id: Ibec32b05a1280456e6f4e2cbfefc7415bd9f8fc1