Revert "begin to remove SkLONGLONG and wean Skia off of Sk64"

include/core/Sk64.h

Index: include/core/Sk64.h
diff --git a/include/core/Sk64.h b/include/core/Sk64.h
index 009744938fe397908ca544317f871eee568f8eac..eba8b684c651f0c62f45a484959eebd625d5c3a8 100644
--- a/include/core/Sk64.h
+++ b/include/core/Sk64.h
@@ -17,17 +17,9 @@
     Sk64 is a 64-bit math package that does not require long long support from the compiler.
 */
 struct SK_API Sk64 {
-private:
     int32_t  fHi;   //!< the high 32 bits of the number (including sign)
     uint32_t fLo;   //!< the low 32 bits of the number
 
-public:
-    int32_t hi() const { return fHi; }
-    uint32_t lo() const { return fLo; }
-
-    int64_t as64() const { return ((int64_t)fHi << 32) | fLo; }
-    int64_t getLongLong() const { return this->as64(); }
-
     /** Returns non-zero if the Sk64 can be represented as a signed 32 bit integer
     */
     SkBool is32() const { return fHi == ((int32_t)fLo >> 31); }
@@ -177,8 +169,9 @@ public:
         return a.fHi > b.fHi || (a.fHi == b.fHi && a.fLo >= b.fLo);
     }
 
-    // Private to unittests. Parameter is (skiatest::Reporter*)
-    static void UnitTestWithReporter(void* skiatest_reporter);
+#ifdef SkLONGLONG
+    SkLONGLONG getLongLong() const;
+#endif
 };
 
 #endif