Merge "Fix bug in JNI BitmapFactory" into gingerbread