Merge "Merged-In Revert "vold: use RAII wake locks""
am: 2ebb5c5b96

Change-Id: I6fe423a47de01eaf3d5bcc27fbfd7d96ea184156