Merge "Fix adb GCC build (for google3)."