Merge "android/utils/filelock.c: Handle stale Win32 lock directories."