Merge "Fix ExifInterface for .heic when meta is at the end" am: 98c9cd7b20
am: 17fc70b1ee

Change-Id: Ib3073cfac59888d707583efd9a9fda1d3731f103