Merge "Write Exif data block for HEIF files" into pi-dev
am: 7bb4333ff2

Change-Id: Ia3f1973406d19b13795bb1a14c8a4594e2225ee9