Merge "Merge "Support scanDirectories with JNI callback function" am: 5747c2b8 am: 34be883e am: baa1210d"