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

Change-Id: I692ea272b29058195e848a53c46fb2f6185fc9bc