am 00c5b26a: (-s ours) am d476e942: am f18cce44: (-s ours) am ef4cd0a4: am d3831760: DO NOT MERGE: Lock drm plugin API calls globally, not per MediaDrm instance
* commit '00c5b26a':
DO NOT MERGE: Lock drm plugin API calls globally, not per MediaDrm instance