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

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