Supports the cap height for FreeType even when TT OS2 version is 1.

include/core/SkPaint.h

Index: include/core/SkPaint.h
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 1244795819063cee64fb86f042bacfef9fa76843..4930842a2e8ec58501be60ffb6799f11975593c5 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -740,7 +740,8 @@ public:
         SkScalar    fMaxCharWidth;  //!< the max charactor width (>= 0)
         SkScalar    fXMin;      //!< The minimum bounding box x value for all glyphs
         SkScalar    fXMax;      //!< The maximum bounding box x value for all glyphs
-        SkScalar    fXHeight;   //!< the height of an 'x' in px, or 0 if no 'x' in face
+        SkScalar    fXHeight;   //!< The height of an 'x' in px, or 0 if no 'x' in face
+        SkScalar    fCapHeight;  //!< The cap height (> 0), or 0 if cannot be determined.
     };
 
     /** Return the recommend spacing between lines (which will be