Further improvement in ServiceLoader (Android compat)