Merge "Fix trivial warning in jpegutil.h."
am: f16c21a499

Change-Id: I2d730fbb2f21b8964b05e5ef79e2367cc95319be