Merge "adb: bump server version to prevent feature mismatch."

std::string adb_version();

// Increment this when we want to force users to start a new adb server.

#define ADB_SERVER_VERSION 32

#define ADB_SERVER_VERSION 33

class atransport;

struct usb_handle;

    // Local static allocation to avoid global non-POD variables.

    static const FeatureSet* features = new FeatureSet{

        kFeatureShell2

        // Increment ADB_SERVER_VERSION whenever the feature list changes to

        // make sure that the adb client and server features stay in sync

        // (http://b/24370690).

    };

    return *features;