Merge commit for internal changes

diff --cc README.md
Simple merge

diff --cc tensorflow/contrib/cmake/python_modules.txt
Simple merge

diff --cc tensorflow/core/ops/math_ops.cc
Simple merge

diff --cc tensorflow/python/BUILD
Simple merge

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

diff --cc tensorflow/tools/api/generator/create_python_api.py
Simple merge

diff --cc tensorflow/tools/pip_package/setup.py
Simple merge