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
am: 77dd50b470

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