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

Change-Id: I37f553a19341d351dcf1fbb275352802b9b09e62