Merge "Fix 64 bit long pointer size for media scanning"