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

include/core/SkFixed.h

Index: include/core/SkFixed.h
diff --git a/include/core/SkFixed.h b/include/core/SkFixed.h
index 42a9eec284ef362d630e3eb0932f090b763d4fb7..580d94b9ca2f813fa3bde204db59e20dbf273cea 100644
--- a/include/core/SkFixed.h
+++ b/include/core/SkFixed.h
@@ -118,11 +118,11 @@ static inline SkFixed SkFixedCos(SkFixed radians) {
 #ifdef SkLONGLONG
     inline SkFixed SkFixedMul_longlong(SkFixed a, SkFixed b)
     {
-        return (SkFixed)((int64_t)a * b >> 16);
+        return (SkFixed)((SkLONGLONG)a * b >> 16);
     }
     inline SkFixed SkFixedSquare_longlong(SkFixed value)
     {
-        return (SkFixed)((int64_t)value * value >> 16);
+        return (SkFixed)((SkLONGLONG)value * value >> 16);
     }
     #define SkFixedMul(a,b)     SkFixedMul_longlong(a,b)
     #define SkFixedSquare(a)    SkFixedSquare_longlong(a)