Merge commit for internal changes

diff --cc configure.py
Simple merge

diff --cc tensorflow/compiler/xla/tests/slice_test.cc
Simple merge

diff --cc tensorflow/contrib/timeseries/python/timeseries/BUILD
Simple merge

diff --cc tensorflow/python/BUILD
Simple merge

diff --cc tensorflow/python/training/distribute.py
Simple merge

diff --cc tensorflow/tools/pip_package/build_pip_package.sh
Simple merge