Merge "vold: use RAII wake locks"
am: b585363d93

Change-Id: I21be9e28c19901c9ca3aa91eb2f7394d1f788ff2