Merge "Add heif format to ExifInterface" into oc-mr1-dev am: e034a1f5ed
am: 3985765a17

Change-Id: I1cb5527a9bb1a63cb960cbc7d38aa955353a28c9