Merge "Unregister Waiter in waitForService"

        std::condition_variable mCv;

    };

    // Simple RAII object to ensure a function call immediately before going out of scope

    class Defer {

    public:

        Defer(std::function<void()>&& f) : mF(std::move(f)) {}

        ~Defer() { mF(); }

    private:

        std::function<void()> mF;

    };

    const std::string name = String8(name16).c_str();

    sp<IBinder> out;

            name, waiter).isOk()) {

        return nullptr;

    }

    Defer unregister ([&] {

        mTheRealServiceManager->unregisterForNotifications(name, waiter);

    });

    while(true) {

        {