am 03b3eda2: am 862438eb: fix build

Merge commit '03b3eda2f87bc2d837586303585321f073ef5c6a'

* commit '03b3eda2f87bc2d837586303585321f073ef5c6a':
  fix build
tree: 054f7a1061a5681e628e057a9b1788858e8a9329
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/