...in type 'int'"; i.e., re-apply 11cc9bdc
"Avoid UBSan 'left shift of 65536 by 16 places cannot be represented..." after
67ef208b "Fixes for migrating SvXMLImport to use
FastParser" removed that fix, for no apparent reason.

Change-Id: I8379d2ae8a39ce8a655688d1168d8de67186472a