BF: avoid importing from inside joblib (scikit-learn#7731)

Debian replaces externals.joblib by an import to joblib, because they
hate duplication. Hence importing from inside joblib doesn't work, and
the line that I removed greats a bug.

See
http://lists.alioth.debian.org/pipermail/neurodebian-users/2016-October/001093.html

Author: GaelVaroquaux

sklearn/metrics/pairwise.py

@@ -24,7 +24,7 @@
 from ..preprocessing import normalize
 from ..externals.joblib import Parallel
 from ..externals.joblib import delayed
-from ..externals.joblib.parallel import cpu_count
+from ..externals.joblib import cpu_count
 
 from .pairwise_fast import _chi2_kernel_fast, _sparse_manhattan