Merge changes I6923e891,Id5c62c31

* changes:
  audioflinger: effect: fix deadlock after dumpsys
  audioeffect: fix segfault on device effect configuration