Merge "Remove unnecessary locking from MediaScanner JNI code"