Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1