Improve ServiceLoader (Android compatibility)