Merge "Remove dependencies on hardware/audio_effects.h and EffectsFactoryApi.h"