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