[automerger skipped] Merge "Start Vold on early-fs" am: 52c856544d
am: 319e6531f9 -s ours
am skip reason: change_id Idfdb304503a163fbb91f9317949eb98c06fecce1 with SHA1 1be83e30c5 is in history

Change-Id: I4eada00cfe2cc7ae54e6dd35b2c97a103b06b2eb