Merge "Use -Werror in external/tinyxml2" am: 733c425397 am: b28b162838 am: 3a4a64ff80
am: 0ed4c5149d

Change-Id: I7392778ec62b18c08b4b693d4254a9757cec72a0