am 514c8ffc: (-s ours) am 0ffe8f97: am 39a8a377: (-s ours) am ddd1c72b: (-s ours) Merge "DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before starting source"
* commit '514c8ffc':
DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before starting source