Merge "Merge remote-tracking branch \'aosp/upstream-master\' into mymerge"
am: 8abae28b3c
* commit '8abae28b3cf3af8772ed9a345503a180ab536f08': (31 commits)
Fix a small error in xmllint --format description
Another variation of overflow in Conditional sections
Add missing Null check in xmlParseExternalEntityPrivate
Fix a bug in CData error handling in the push parser
Fix a bug on name parsing at the end of current input buffer
Fix the spurious ID already defined error
Fix previous change to node sort order
Avoid XSS on the search of xmlsoft.org
Recover unescaped less-than character in HTML recovery parsing
Fix a self assignment issue raised by clang
Fail parsing early on if encoding conversion failed
Do not process encoding values if the declaration if broken
Silence clang's -Wunknown-attribute
os400: fix various ILE/RPG types definitions. Adjust build scripts. - A typo caused an undefined symbol reference. - A structure field name did not match the corresponding C name due to a typo. - Some structured fields were not properly aligned. - The long/ulong types were wrongly mapped to 64-bit types. - A typo in a /include directive caused a compilation error. - Doc files copy now converts from UTF-8 and split long lines. - Adjust /include file name mapping translation for proper prefix handling.
CVE-2015-1819 Enforce the reader to run in constant memory
xmlMemUsed is not thread-safe
Allow HTML serializer to output HTML5 DOCTYPE
Fix support for except in nameclasses
Regression test for bug #695699
Add a couple of XPath tests
...