Merge "Skia API changes as a result of an update to the Skia library."

#include <SkImageEncoder.h>

#include <SkBitmap.h>

#include <SkData.h>

#include <SkStream.h>

using namespace android;

            SkDynamicMemoryWStream stream;

            SkImageEncoder::EncodeStream(&stream, b,

                    SkImageEncoder::kPNG_Type, SkImageEncoder::kDefaultQuality);

            write(fd, stream.getStream(), stream.getOffset());

            SkData* streamData = stream.copyToData();

            write(fd, streamData->data(), streamData->size());

            streamData->unref();

        } else {

            write(fd, &w, 4);

            write(fd, &h, 4);

    static void freeCaches(JNIEnv* env, jobject) {

        // these are called in no particular order

        SkImageRef_GlobalPool::SetRAMUsed(0);

        SkGraphics::SetFontCacheUsed(0);

        SkGraphics::PurgeFontCache();

    }

    static jboolean isOpaque(JNIEnv* env, jobject jcanvas) {