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

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