Reland "Merge cellspace into old pointer space"

include/v8.h

Index: include/v8.h
diff --git a/include/v8.h b/include/v8.h
index c7ec799c3986e965fb990b03a7298a3fe2af13a1..8019a4522b4bafb811263bc39bb53e516fbeb2b6 100644
--- a/include/v8.h
+++ b/include/v8.h
@@ -4750,8 +4750,7 @@ enum ObjectSpace {
   kObjectSpaceOldSpace = 1 << 1,
   kObjectSpaceCodeSpace = 1 << 2,
   kObjectSpaceMapSpace = 1 << 3,
-  kObjectSpaceCellSpace = 1 << 4,
-  kObjectSpaceLoSpace = 1 << 5,
+  kObjectSpaceLoSpace = 1 << 4,
   kObjectSpaceAll = kObjectSpaceNewSpace | kObjectSpaceOldSpace |
                     kObjectSpaceCodeSpace | kObjectSpaceMapSpace |
                     kObjectSpaceLoSpace
@@ -6741,7 +6740,7 @@ class Internals {
   static const int kJSObjectType = 0xbe;
   static const int kFirstNonstringType = 0x80;
   static const int kOddballType = 0x83;
-  static const int kForeignType = 0x87;
+  static const int kForeignType = 0x86;
 
   static const int kUndefinedOddballKind = 5;
   static const int kNullOddballKind = 3;