Merge "heif: address api review comments" into pi-dev
am: ffb6521082

Change-Id: Id4d960bc09434583ef9ab231d1e110248d31384a