am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."
am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."

* commit 'bfc440923ecb8f32448c675095a2096049fe7ebe':
  mediaeditor shouldn't depend on audioflinger.

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