Merge "Make EffectsFactoryHalHidl members const"