Merge "Fix heif related MediaFormat key names in ndk" into pi-dev