am 36859212: Merge "Move vold to libc++."

* commit '36859212614fd112e08dcf92065ee6db910769bb':
  Move vold to libc++.