Android S Beta 3
DO NOT MERGE - Merge ab/7272582 am: 8a2c17c5d1

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

Change-Id: Ic89f8e2e02bc8219b8ccaf6d82b9d45502097a31