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

Change-Id: I33880ecff74ecdc2a60b0857b3cb8e8164232030