Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
tree: a3af410cc5f0990f5caf0bf01fc77702acdfc247
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/