am b661c37f: am cd26a2dd: Merge "Remove HAVE_STDINT_H namespace pollution."

* commit 'b661c37f4dad27b1917c99eac3220a2a4057565d':
  Remove HAVE_STDINT_H namespace pollution.