am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"

* commit 'f0dbf00d37c349e8c615045876d6bc89b6bb8c54':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils