Merge commit for internal changes

diff --cc tensorflow/contrib/cmake/tf_python.cmake
Simple merge

diff --cc tensorflow/contrib/lite/kernels/internal/BUILD
Simple merge

diff --cc tensorflow/core/BUILD
Simple merge

diff --cc tensorflow/core/framework/register_types.h
Simple merge

diff --cc tensorflow/python/BUILD
Simple merge

diff --cc tensorflow/python/kernel_tests/BUILD
Simple merge

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

diff --cc tensorflow/workspace.bzl
Simple merge