am 1ae17633: am 411350dd: am 739ae9b3: am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm"

* commit '1ae176335548f0273e040b6ac0c34e2274789b88':
  Fix a JNI local reference leak in MediaDrm