am 3b2d54a0: Merge "Error handling in ACodec and Nuplayer."

* commit '3b2d54a0e71526ed23b0cd385137b93f2572d09c':
  Error handling in ACodec and Nuplayer.