am edde28fd: am 5d5526aa: Merge "Handle errors from AudioEffect::queryNumberEffects"

* commit 'edde28fd0956d941e4962e3228f3030e203da4aa':
  Handle errors from AudioEffect::queryNumberEffects