Merge "move /data/tombstone creation to system/core"