Merge "Merge "heif: address api review comments" into pi-dev am: ffb6521082" into pi-dev-plus-aosp
am: 9079589e0c

Change-Id: I13e3e5884e6ec6a86e587fa667e01cafe63850de