Merge "Add javadocs to MediaCodec.CryptoInfo methods" into nyc-dev