Merge "Fix adb GCC build (for google3)."
am: 834799f01d

* commit '834799f01dbca29a6a0522a8d78c853ce18bf458':
  Fix adb GCC build (for google3).