Force merge of remaining KLP changes to fix build.

import java.io.File;

import java.lang.reflect.Field;

import java.lang.reflect.Method;

import java.util.concurrent.locks.ReentrantReadWriteLock;

import android.content.Context;

import android.content.pm.ApplicationInfo;

    }

    ContextType mContextType;

    ReentrantReadWriteLock mRWLock;

    // Methods below are wrapped to protect the non-threadsafe

    // lockless fifo.

    native void rsnContextDestroy(int con);

    synchronized void nContextDestroy() {

        validate();

        rsnContextDestroy(mContext);

        // take teardown lock

        // teardown lock can only be taken when no objects are being destroyed

        ReentrantReadWriteLock.WriteLock wlock = mRWLock.writeLock();

        wlock.lock();

        int curCon = mContext;

        // context is considered dead as of this point

        mContext = 0;

        wlock.unlock();

        rsnContextDestroy(curCon);

    }

    native void rsnContextSetSurface(int con, int w, int h, Surface sur);

    synchronized void nContextSetSurface(int w, int h, Surface sur) {

        validate();

        return rsnGetName(mContext, obj);

    }

    // nObjDestroy is explicitly _not_ synchronous to prevent crashes in finalizers

    native void rsnObjDestroy(int con, int id);

    synchronized void nObjDestroy(int id) {

    void nObjDestroy(int id) {

        // There is a race condition here.  The calling code may be run

        // by the gc while teardown is occuring.  This protects againts

        // deleting dead objects.

        if (ctx != null) {

            mApplicationContext = ctx.getApplicationContext();

        }

        mRWLock = new ReentrantReadWriteLock();

    }

    /**

     */

    public void destroy() {

        validate();

        nContextFinish();

        nContextDeinitToClient(mContext);

        mMessageThread.mRun = false;

        try {

        }

        nContextDestroy();

        mContext = 0;

        nDeviceDestroy(mDev);

        mDev = 0;