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

* commit '89bcc638ab24af7bee0ff3ccfa190a08b721f0a4':
  Move vold to libc++.