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