Merge "Update our libjpeg to the version used by Chromium." into master-skia

https://skia.googlesource.com/skia/+/29ccd898d1ffcf2e2a68821af3393a4cfd90e725

Change-Id: I8161dc626cdedf822118b50a45b0d045d0b560e2