Fix bug in removal of *.flock files.

Bug: 20816098
Change-Id: I72ee32884f32af43a54518c9b9772f63957ab5de
2 files changed