am 29c5a78f: Merge "Fix build of adb with gcc-4.9."

* commit '29c5a78fdc163f7d5e5e3a00729b8c37a89562f6':
  Fix build of adb with gcc-4.9.