Merge cherrypicks of [15718931, 15718932, 16248754] into rvc-platform-release. am: 5e9d775fc8 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libexif/+/16493355 Change-Id: I619b2f25b5ccde46922c2b2689936cb05a6998d4