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

Change-Id: I451ff7e0fca73527c2075677707f5606d22c8d85