Merge "Untangle MediaScanner error handling. Bug: 5056917"
tree: 9e514035df9287a884ea0e8fdb8e1f00d3786052
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/