Revert of Respect declared font style on Android. (patchset #6 id:100001 of https://codereview.chromium.org/1092093002/)

Reason for revert:
Failed on the compile bots.

Original issue's description:
> Respect declared font style on Android.
>
> Previously the normal/italic style bit was obtained from scanning the
> font file. With the new format the style may be stated explicitly, and
> this explicit value in the configuration file should override any
> information obtained from the font data itself.
>
> This change allows the font element's style attribute to override the
> font's style, but retains the default 'auto' setting for backwards
> compatibility. Repecting the style bit may become more important with
> variation fonts, because it will be up to the configuration writer to
> determine what values of the 'slnt' variation should be considered
> 'normal' or 'italic'.
>
> DOCS_PREVIEW= https://skia.org/?cl=1092093002
>
> Committed: https://skia.googlesource.com/skia/+/673e902c9b9982a167f54f1cc175d8d9cab8bcaf

TBR=mtklein@google.com,tomhudson@google.com,scroggo@google.com,bungeman@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1082173004

1 files changed, 4 insertions, 13 deletions

diff --git a/site/dev/contrib/style.md b/site/dev/contrib/style.md
index 177a58b8d4..e952ed1b68 100644
--- a/site/dev/contrib/style.md
+++ b/site/dev/contrib/style.md
@@ -78,19 +78,10 @@ int herdCats(const Array& cats) {
 }
 ~~~~
 
-Enum values are prefixed with k. Unscoped enum values are post fixed with
-an underscore and singular name of the enum name. The enum itself should be
-singular for exclusive values or plural for a bitfield. If a count is needed it
-is  k<singular enum name>Count and not be a member of the enum (see example):
-
-<!--?prettify?-->
-~~~~
-enum class SkPancakeType {
-     kBlueberry,
-     kPlain,
-     kChocolateChip,
-};
-~~~~
+Enum values are prefixed with k and have post fix that consists of an underscore
+and singular name of the enum name. The enum itself should be singular for
+exclusive values or plural for a bitfield. If a count is needed it is 
+k<singular enum name>Count and not be a member of the enum (see example):
 
 <!--?prettify?-->
 ~~~~