Merge "Use changed MediaCodec.PARAMETER_KEY_VIDEO_BITRATE value" into klp-dev