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 am: b760e61686  -s ours
am: d5cb8b417b

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