SkPDF: roll back 53b1c09 and 05b48e2

See:
	https://crrev.com/1552263003
	https://crrev.com/1438503002

	BUG=skia:257
	BUG=skia:734
  BUG=577794

Review URL: https://codereview.chromium.org/1645803003
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1752913002
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true
TBR=tomhudson@google.com

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