Merge "Catch Java exceptions in the FileObserver JNI code"