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

Change-Id: Iba5d07b0b08814fde97cd2084f0c13618db784bc