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

Change-Id: I29434a098971b0e5d854456fd79c27b49b068f22