Merge "CleanSpec: adb uses the static libraries"