Merge "Fix typo in MediaDrm.java"