Merge "Update to use the correct jpeg lib" into rvc-dev am: 82dff2337b

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish/+/12195980

Change-Id: I09305abba194697a91b952a7545bbbfe05caf986