Merge "init: don't start tombstoned until /data is mounted."
am: b479a5002e

Change-Id: I00bbcc2adbdc31486e9fe5e4deed9901feacbb4c