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

* commit '18befbf0162d23140962497fece15c2de4009144':
  Fix adb GCC build (for google3).