Merge "Fix compilation warning on MediaDrm"