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

Change-Id: I5ad79b54f9f42e6b04d81ca8123e5b41b03e92fb