Prefer "jpg" over "jpeg" as the extension for "image/jpeg".

Bug: 18390752

(cherry picked from commit 2a63032eb1c020ad3e73177951142735e11e044e)

Change-Id: I713930b8ad8d8a1353d289c1f9268159c3ad862d
2 files changed