Fix crashes on corrupt files.

b/11184427

Change-Id: I70fe00a0b7158b01d1633a474b42851f983fbc49
am afa1f6ba: Fix crashes on corrupt files.

* commit 'afa1f6bad4e2a387c6d3889132fcd1c8dc80ae4a':
  Fix crashes on corrupt files.
Merge tag 'tags/android-4.4_r1' into kitkat-staging

Android 4.4 Release 1.0