Merge "Destroy drawing cache when switching layer type" into nyc-dev

            return;

        }

        // Destroy any previous software drawing cache if needed

        if (mLayerType == LAYER_TYPE_SOFTWARE) {

        if (layerType != LAYER_TYPE_SOFTWARE) {

            // Destroy any previous software drawing cache if present

            // NOTE: even if previous layer type is HW, we do this to ensure we've cleaned up

            // drawing cache created in View#draw when drawing to a SW canvas.

            destroyDrawingCache();

        }