Merge "media: document MediaFormat.KEY_FRAME_RATE better" into nyc-dev