Merge "MediaDrm: remove @StringProperty/@ArrayProperty"