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

Change-Id: I9d29369da6c7bf0ef0681f0b09c85097b83bfebd