Bug 848311 - [email] fix secret debug menu's fancy structured debug logg...

...ing saving to DeviceStorage. rs=debug-only

This includes some whitespace changes from changes to the GELAM build process
that did not merit their own commit.