Merge "Fix issue 5355047: Automated effect tests fail."
tree: 10602c3175014873741469cbf20f5f7737d74f7a
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/