Merge "vold: fix missing has.adoptable" am: 9e2053e185

Change-Id: I3f87b104678fb57c627165fcd5faea846e25d343