Merge "heif: OMX image encoder header changes -- DO NOT MERGE" into pi-dev