am 3b3d2160: am 7547b8ea: fix build

Merge commit '3b3d2160b7c8a17f44476d34408296264d57f2cc'

* commit '3b3d2160b7c8a17f44476d34408296264d57f2cc':
  fix build
tree: 69cfc0d4704e723c413a20ca2686bb7c3dc66340
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/