am ddd1c72b: (-s ours) Merge "DO NOT MERGE: mediaplayer: ensure secure...
am ddd1c72b: (-s ours) Merge "DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before starting source"
* commit 'ddd1c72b':
DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before starting source