Merge "fix deadlock in audioflinger::createEffect()" into klp-dev