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

Change-Id: I141ff0699c25e4d05694c4135b7c356edc516181