ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20  -s ours

* commit 'c61a896f2006d76fd3d805ace2282b9590432a67':
  ensure /data/tombstones exists on all Android device. DO NOT MERGE