Merge "Adjust for small changes in the native keystore interface"

            sp<IBinder> binder = sm->getService(String16("android.security.keystore"));

            sp<IKeystoreService> service = interface_cast<IKeystoreService>(binder);

            if (service != NULL) {

                status_t ret = service->addAuthToken(*auth_token, *auth_token_length);

                if (ret != ResponseCode::NO_ERROR) {

                    ALOGE("Falure sending auth token to KeyStore: %d", ret);

                auto ret = service->addAuthToken(*auth_token, *auth_token_length);

                if (!ret.isOk()) {

                    ALOGE("Failure sending auth token to KeyStore: %" PRId32, int32_t(ret));

                }

            } else {

                ALOGE("Unable to communicate with KeyStore");