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

* commit '86088564de6f688556e7f045e951dccd7b74f18c':
  Fix adb GCC build (for google3).