Merge "Abolish calls to shell in vold" am: 69dc26411a
am: beed036771

Change-Id: I54d332e4938933b1fc24bcc20ec4a6feb479d5bb