am d07555db: Merge "ensure /data/tombstones exists on all Android devices"

* commit 'd07555dba01d64011b0d611dd6d3b197b216c163':
  ensure /data/tombstones exists on all Android devices