Merge "vold: use RAII wake locks" am: 798aa303da
am: 56c6681ba8

Change-Id: I3f87e1ad31701c24fdc426c3bd562a47871e3631