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

Change-Id: I36fb2559b52bb778acff72954012704da8a85ff9