* commit '
24adc0400381612a97e8b30d83484f4107819d5c':
Revert "camera: Fix setParameters for Preview FPS single/range values"
stagefright: allow for minUndequeuedBufs to be one less
camera3: Remove old vendor tag ops dependencies.
Revert "Convert AudioFlinger mSinkBuffer to flexible format"
Fix freeze on pause
audioflinger: fix race condition in SyncEvent callback
Support "data:" URIs again in mediaplayer...
frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new default
libstagefright: Delay release of wakelock in TimedEventQueue
Revert "stagefright: fix TimedEventQueue wakelock"