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

Change-Id: I72c71a287162811acb24b9bc8be381b88b818488