Fix bug in removal of *.flock files.

Bug: 20816098
(cherry picked from commit 581f4e9065b9b7f788315d3ea1a45e51ae168589)

Change-Id: Ib7bd394a9dd0299f09d386ae010972b461217550
2 files changed