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

* commit 'b98029847d31575722084047b508ea5e6f5206fd':
  android/utils/filelock.c: Handle stale Win32 lock directories.