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

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