Merge "Merge "Support scanDirectories with JNI callback function" am: 5747c2b81c am: 34be883ebd am: baa1210d25"