Merge "Fix StringDef usage in MediaDrm API" into oc-dev