Merge commit for internal changes

diff --cc tensorflow/compiler/xla/python/xla_client.py
Simple merge

diff --cc tensorflow/contrib/lite/toco/model.h
Simple merge

diff --cc tensorflow/contrib/lite/toco/tooling_util.cc
Simple merge

diff --cc tensorflow/contrib/py2tf/converters/BUILD
Simple merge

diff --cc tensorflow/contrib/py2tf/converters/side_effect_guards.py
Simple merge

diff --cc tensorflow/contrib/rnn/python/ops/rnn_cell.py
Simple merge

diff --cc tensorflow/docs_src/get_started/get_started_for_beginners.md
Simple merge

diff --cc tensorflow/python/BUILD
Simple merge

diff --cc tensorflow/python/kernel_tests/array_ops_test.py
Simple merge

diff --cc tensorflow/python/ops/array_ops.py
Simple merge