Merge "Remove PDF JPEG shortcut, since it fails on grayscale JPEGs." into master-skia

https://skia.googlesource.com/skia/+/d476a176b774c387b242fa8fb2a9296d722c34aa

Change-Id: I2ae2cb8c323f3df1c0cfbaff776fd880b4ba4b68