Merge "Remove the field of MediaDrm from inner class CryptoSession."
am: 2c37b51

* commit '2c37b515ee4d0e7da174096d7d744084445953a0':
  Remove the field of MediaDrm from inner class CryptoSession.