Merge "Revert "Revert "Enable ANGLE-for-Android rule processing again"""

    } else {

    } else {

        // The "Developer Options" value wasn't set to force the use of ANGLE.  Need to temporarily

        // The "Developer Options" value wasn't set to force the use of ANGLE.  Need to temporarily

        // load ANGLE and call the updatable opt-in/out logic:

        // load ANGLE and call the updatable opt-in/out logic:

        void* featureSo = loadLibrary("feature_support");

        // Check if ANGLE is enabled. Workaround for several bugs:

        // b/119305693 b/119322355 b/119305887

        // Something is not working correctly in the feature library

        char prop[PROPERTY_VALUE_MAX];

        property_get("debug.angle.enable", prop, "0");

        void* featureSo = nullptr;

        if (atoi(prop)) {

            featureSo = loadLibrary("feature_support");

        }

        if (featureSo) {

        if (featureSo) {

            ALOGV("loaded ANGLE's opt-in/out logic from namespace");

            ALOGV("loaded ANGLE's opt-in/out logic from namespace");

            mUseAngle = checkAngleRules(featureSo);

            mUseAngle = checkAngleRules(featureSo);