Actually don't start tombstoned until /data is mounted.
am: 0ad5107e51

Change-Id: I829a088921adb6253a1dec3c39a1ffe171b90f5c