Protect against wifihelper npe.

Also refactor the output handling to remove unused logic.

Bug 8023714

Change-Id: I1627219f97d09118e5c66637c100886e0ef2b245
4 files changed