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

Change-Id: I912bf88877f892450eb0389c1c2679180c0b5181