Merge "ScopedFlock: Refactor it to be a subclass of FdFile." am: c348380cc2
am: 151e040ab7

Change-Id: I28a2806a832270619a73b5d3f78656e9112f1cd9