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

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