Merge "Modification for using Software decoder for thumbnail generation in JNI" into honeycomb