fix double declaration of dalvik and use proper one