Merge "Fixed bug in BitmapFactory.decodeStream"