Merge changes I58054d98,Ia493da3f

* changes:
  Revert "Move EffectsConfig loading in AudioPolicyEffects to libAudioHal"
  Revert "Make EffectsFactoryHalHidl members const"