Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/jpeg into mr1-staging