Merge "vold: fix missing has.adoptable"