Merge "Information required to decrypt buffers is now packaged into MediaCodec.CryptoInfo"