Merge "Re-enable atlas" into lmp-preview-dev

#define PROPERTY_RENDER_DIRTY_REGIONS "debug.hwui.render_dirty_regions"

#define GLES_VERSION 2

#define USE_TEXTURE_ATLAS false

// Android-specific addition that is used to show when frames began in systrace

EGLAPI void EGLAPIENTRY eglBeginFrame(EGLDisplay dpy, EGLSurface surface);

}

void GlobalContext::initAtlas() {

    if (USE_TEXTURE_ATLAS) {

    if (mAtlasBuffer.get()) {

        Caches::getInstance().assetAtlas.init(mAtlasBuffer, mAtlasMap, mAtlasMapSize);

    }

}