Merge "Fixes the crash issues caused by exif corruption in jhead." am: e7dac1df82
am: dd71aecc72

* commit 'dd71aecc726f9d8b5534d0902406d41bfaa487b8':
  Fixes the crash issues caused by exif corruption in jhead.

Change-Id: Ic45a855d8f2c03c9ee2361da8640a553cd720c41