Merge "Extend MediaCodec.CryptoInfo to support Sample AES"