Merge "Clean up EffectHalInterface"