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

Change-Id: I8f878e12eee9d18dc61aad0d11dc5092234cfa39