Merge "Add bootctl for vold"