Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: 1ea7fce31a

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

Change-Id: I784d4e377d833f4f4e41b034b4eee9bc463dca9a