Resolve inconsistent treatment of stubs in kAppJIT snapshots in favor of write stubs in the snapsho…

runtime/vm/clustered_snapshot.cc

Index: runtime/vm/clustered_snapshot.cc
diff --git a/runtime/vm/clustered_snapshot.cc b/runtime/vm/clustered_snapshot.cc
index 11d9dd050935b76e8347b12e12a45f2de8e12989..8685c23a15bce7cb6378ff4558dac6e0fb827ffe 100644
--- a/runtime/vm/clustered_snapshot.cc
+++ b/runtime/vm/clustered_snapshot.cc
@@ -1934,7 +1934,7 @@ class RODataSerializationCluster : public SerializationCluster {
     s->Write<int32_t>(count);
     for (intptr_t i = 0; i < count; i++) {
       RawObject* object = objects_[i];
-      int32_t rodata_offset = s->GetRODataOffset(object);
+      int32_t rodata_offset = s->GetDataOffset(object);
       s->Write<int32_t>(rodata_offset);
       s->AssignRef(object);
     }
@@ -4856,7 +4856,7 @@ void Serializer::AddVMIsolateBaseObjects() {
   AddBaseObject(table->At(kDynamicCid));
   AddBaseObject(table->At(kVoidCid));
 
-  if (kind_ != Snapshot::kAppAOT) {
+  if (!Snapshot::IncludesCode(kind_)) {
     for (intptr_t i = 0; i < StubCode::NumEntries(); i++) {
       AddBaseObject(StubCode::EntryAt(i)->code());
     }
@@ -5261,7 +5261,7 @@ void Deserializer::AddVMIsolateBaseObjects() {
   AddBaseObject(table->At(kDynamicCid));
   AddBaseObject(table->At(kVoidCid));
 
-  if (kind_ != Snapshot::kAppAOT) {
+  if (!Snapshot::IncludesCode(kind_)) {
     for (intptr_t i = 0; i < StubCode::NumEntries(); i++) {
       AddBaseObject(StubCode::EntryAt(i)->code());
     }