Merge "Switch to tombstoned.microdroid"