am 856f37a8: Merge "mediaplayer: handle decoder error when NuPlayerDecoder...
am 856f37a8: Merge "mediaplayer: handle decoder error when NuPlayerDecoder gets a NULL buffer from MediaCodec." into mnc-dev
* commit '856f37a8':
mediaplayer: handle decoder error when NuPlayerDecoder gets a NULL buffer from MediaCodec.