Merge "Fix ParseInt/ParseUint to handle explicit "0x" hex." am: ddf5edacc2 am: 1de89478ac
am: 60c545050d

* commit '60c545050d68ec6a82903ab4557a8088422afee6':
  Fix ParseInt/ParseUint to handle explicit "0x" hex.