Merge commit 'ab802d5f2319768f8250c1a8819e327e2f9f2843' into master

Update matplotlib-cpp, and make it work with the sandboxed python

Change-Id: Ie9836993f9ab6f8f28877e5958d4b4f119db4632
diff --git a/debian/matplotlib.BUILD b/debian/matplotlib.BUILD
index af2c4b7..e7e9b6f 100644
--- a/debian/matplotlib.BUILD
+++ b/debian/matplotlib.BUILD
@@ -1,6 +1,6 @@
 load("@//debian:matplotlib.bzl", "build_matplotlib")
 
-build_matplotlib("3", "3.5")
+build_matplotlib("3", tkinter_py_version="3.5")
 
 build_matplotlib(
     "2.7",
diff --git a/debian/python.BUILD b/debian/python.BUILD
index 6f9150d..7abcf1f 100644
--- a/debian/python.BUILD
+++ b/debian/python.BUILD
@@ -3,7 +3,7 @@
 cc_library(
     name = "python3.5_lib",
     srcs = [
-        "usr/lib/x86_64-linux-gnu/libpython3.5m.so",
+        "usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0",
     ],
     hdrs = glob(["usr/include/**/*.h"]),
     includes = [