am 26795e6c: am 2d829928: Merge change 22818 into eclair

Merge commit '26795e6c40f3f96a6b5fcd4434b7603a6e0fed4b'

* commit '26795e6c40f3f96a6b5fcd4434b7603a6e0fed4b':
  assert => CHECK in stagefright.