am ef4cd0a4: am d3831760: DO NOT MERGE: Lock drm plugin API calls globally,...
am ef4cd0a4: am d3831760: DO NOT MERGE: Lock drm plugin API calls globally, not per MediaDrm instance
* commit 'ef4cd0a4':
DO NOT MERGE: Lock drm plugin API calls globally, not per MediaDrm instance