am 2597aedb: Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb

* commit '2597aedb3869e46f945359c529e03263c77a944d':
  Turn another assertion into a runtime error. Damn you surfaces.
tree: df692b18c7892879bff2c3144e03008a859094b2
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/