am 6a9cb7dd: am e05c33fe: Merge "Modification for using Software decoder for thumbnail generation in JNI" into honeycomb

* commit '6a9cb7ddec346145b4563e06ff0940199758f888':
  Modification for using Software decoder for thumbnail generation in JNI