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

Change-Id: I0ab85e0d65c88184a1fc90f569379eab5a24fa4c