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

Change-Id: Ibb6db27d179e6dc64adc0add7ad163d2a30ec979