Better stub resolver for Android