Merge "Remove the emulator special case from the "adb root" code."

#if defined(ALLOW_ADBD_ROOT)

    char value[PROPERTY_VALUE_MAX];

    // The emulator is never secure, so don't drop privileges there.

    // TODO: this seems like a bug --- shouldn't the emulator behave like a device?

    property_get("ro.kernel.qemu", value, "");

    if (strcmp(value, "1") == 0) {

        return false;

    }

    // The properties that affect `adb root` and `adb unroot` are ro.secure and

    // ro.debuggable. In this context the names don't make the expected behavior

    // particularly obvious.