Merge "Fix mac build; add closures.c for python3"
am: 46321e5e76

Change-Id: I40de11e60aa3f7ae405c6a1a175e7f336388b545