Merge "vold: use RAII wake locks" am: b585363d93 am: 99fd2a4b5a
am: a4a04f5717

Change-Id: Ifc5e42eaebc4e07688180e008612c5b2de3d7caf