ensure /data/tombstones exists on all Android device. DO NOT MERGE am:...
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed663 am: c61a896f -s ours
am: d61ebb08
* commit 'd61ebb08':
ensure /data/tombstones exists on all Android device. DO NOT MERGE