Merge "Merged-In Revert "vold: use RAII wake locks"" am: 2ebb5c5b96 am: fce081efa6
am: 0e2317857b

Change-Id: I1fa6054701877f2e6b81bd22292311234f47bc64