Merge "Fix build of adb with gcc-4.9."