Merge "A little cleanup in MediaScanner JNI code"