Revert of Update Skia's YUV API

src/core/SkYUVPlanesCache.h

Index: src/core/SkYUVPlanesCache.h
diff --git a/src/core/SkYUVPlanesCache.h b/src/core/SkYUVPlanesCache.h
index 1c866a2d2b706683871db1e8da12d7391d3d60fa..a024192d07c21a192ffa16ebb5df114639c2cb8c 100644
--- a/src/core/SkYUVPlanesCache.h
+++ b/src/core/SkYUVPlanesCache.h
@@ -10,7 +10,6 @@
 
 #include "SkCachedData.h"
 #include "SkImageInfo.h"
-#include "SkYUVSizeInfo.h"
 
 class SkResourceCache;
 
@@ -20,11 +19,17 @@
      * The Info struct contains data about the 3 Y, U and V planes of memory stored
      * contiguously, in that order, as a single block of memory within SkYUVPlanesCache.
      *
-     * fSizeInfo: fWidth, fHeight, and fWidthBytes of each of the Y, U, and V planes.
+     * fSize: Width and height of each of the 3 planes (in pixels).
+     * fSizeInMemory: Amount of memory allocated for each plane (may be different from
+                      "height * rowBytes", depending on the jpeg decoder's block size).
+     *                The sum of these is the total size stored within SkYUVPlanesCache.
+     * fRowBytes: rowBytes for each of the 3 planes (in bytes).
      * fColorSpace: color space that will be used for the YUV -> RGB conversion.
      */
     struct Info {
-        SkYUVSizeInfo   fSizeInfo;
+        SkISize fSize[3];
+        size_t  fSizeInMemory[3];
+        size_t  fRowBytes[3];
         SkYUVColorSpace fColorSpace;
     };
     /**