Merge change 22818 into eclair

* changes:
  assert => CHECK in stagefright.