Merge "Fix double-checked locking bug in LocalSocket." into gingerbread