Don't crash on corrupt files

b/13652927

Change-Id: I33cd8e0ba9deda1c8aefe39120df90f42aead529
Merge tag 'android-4.4.3_r1' into HEAD

Android 4.4.3 release 1