[automerger skipped] Fix MakerNote tag size overflow issues at read time. am: fd5f7bab83 am: d303368591 am: aa9a617a21 am: 2c92a6dd3e am: 35d454c425 -s ours am: 5d51a4d559 -s ours am: db8f06c3ff -s ours

am skip reason: Merged-In Id106e79e829329145d27a93273241b58878bfac3 with SHA-1 b0ce69382b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libexif/+/15718931

Change-Id: I7c1ba19d35913bed6fa7db0993839c8c6c3e5dd5