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

Change-Id: Ia44d8a20f249aad096fe9c646325e27a6b6a15d3