am 2d829928: Merge change 22818 into eclair

Merge commit '2d829928792f99f9cf44ca5d9d1c1eb6cb771c5a' into eclair-plus-aosp

* commit '2d829928792f99f9cf44ca5d9d1c1eb6cb771c5a':
  assert => CHECK in stagefright.