fix some selendroid and unlock_apk issues