Merge "Remove the field of MediaDrm from inner class CryptoSession." into nyc-dev