am 465d42ef: Merge "Increase the avi extractor\'s confidence slighly over mp3\'s"
am 465d42ef: Merge "Increase the avi extractor\'s confidence slighly over mp3\'s"

* commit '465d42ef781db15a603427115bd66341eb907c31':
  Increase the avi extractor's confidence slighly over mp3's

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base