am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."

* commit '5e57c2cf83ef62e9887592b46a4c3352662fb988':
  Stagefright: Return error if codec takes too long to return a buffer.