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