Fix freeze-ing issues when building with CMakeified Python.

Change-Id: I92630f4f708c488d75a026a3bf72dbd3bb9ac158
Merge topic 'freeze_python' into next

05bb5d2 Fix freeze-ing issues when building with CMakeified Python.