Merge "Change a Stagefright assert to an error check."
tree: 0109a3b890ff3fedf136894b88c1b17852472bb2
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/