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

Change-Id: I3011f662f543a2fe4f27dbef092a635ebe3d13ab