Attempt to make DefaultZipsInstaller#deleteData more reliable.

Also fix NPE in WifiHelper.

Change-Id: I19e86ca6584c9eab22638967957c607a8f4705f8
6 files changed