Merge "Convert vold to new BootControl client"