Merge "Minor fixes in EffectHalAidl_test" into main