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

* commit '771f6f299f16704b251d6adb8fb185c8fb517d07':
  Fix build of adb with gcc-4.9.