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

Change-Id: I28927b75a4807400de5b242e700fef68a1270ec9