resolved conflicts for merge of c71c678e to master

    String8 input(bundle->getSingleCrunchInputFile());

    String8 output(bundle->getSingleCrunchOutputFile());

    return preProcessImageToCache(bundle, input, output);

    if (preProcessImageToCache(bundle, input, output) != NO_ERROR) {

        // we can't return the status_t as it gets truncate to the lower 8 bits.

        return 42;

    }

    return NO_ERROR;

}

char CONSOLE_DATA[2925] = {