am 14f31097: am 79afbdd4: am 9789c42e: Fix crashes for images that are not PNG or JPEG

* commit '14f3109747feafff22a75851349476cf5ae58720':
  Fix crashes for images that are not PNG or JPEG