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