Fix a weird NPE when loading on my grouper... which hasn't been clean flashed since 4.1-ish

Change-Id: I0859252962a1e4915c6fe37dfc86010640868f8e