Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread