am a20bb17e: Merge "Move vold to GCC."

* commit 'a20bb17e4c6095a77425418d7eb0c1ceb50d05f7':
  Move vold to GCC.