deb: Revert some init changes to fix device encryption

Something here is preventing framework from restarting
properly which breaks device encryption.  Revert for now
as some of this may be candidates for Flo merging anyway.

Change-Id: I2a9b4c3c27e9ca8b8de57c487f3a59a50da0ec0f
Merge branch 'cm' into HEAD