Merge "Fix bug in MediaCrypto.setMediaDrmSession" into mnc-dev