Don't create tombstone directory. DO NOT MERGE

Partial backport of cf79748.

Bug: http://b/26403620
Change-Id: I412889bfa331c96ad8e2ce6e0d66b54fb230e8c0
1 file changed