Remove nulls from the edify generator.

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

Change-Id: I0c52335a27f7ae974279fde1c2461b2dba24d263
Add auditd

Change-Id: I54717edbeb9677e53bdd01e6519edd30c387bfe8
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0