Remove nulls from the edify generator.

These would break the scripts. WTF are they doing here?

Change-Id: I0c52335a27f7ae974279fde1c2461b2dba24d263
(cherry picked from commit 5b6f4a18e593c6b6a63ebffab2ca5915dcc4b972)