Merge "Revert "Migrating PerFrameMetadataKey, Hdr, and PixelFormat to LLNDK""