Merge "Fix a JNI local reference leak in MediaDrm"