Merge changes from topic "fix_emu_boot"

* changes:
  Revert "audiopolicy: moves Stream Volume Curves to Engine"
  Revert "audiopolicy: engine: use apm XML config file for volume curves"