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

* commit '5a5d56b9ef5f2ce979344bf1deade4e128693cbb':
  Remove the field of MediaDrm from inner class CryptoSession.