Re-add MusicFX and Remove Provision

Change-Id: Ifca6c126b50377cf3d9120e997cf375e708aa320