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

Change-Id: I654b9f033eba8db137e83effe63a79a80c1abb0f