am d24ac171: am 8cd48574: Fixed bug in BitmapFactory.decodeStream

Merge commit 'd24ac17121b23efb17219f355e5dd38f933352ff'

* commit 'd24ac17121b23efb17219f355e5dd38f933352ff':
  Fixed bug in BitmapFactory.decodeStream