am 862438eb: fix build

Merge commit '862438eb69297accde289230f4c4623b56a39458' into gingerbread-plus-aosp

* commit '862438eb69297accde289230f4c4623b56a39458':
  fix build
tree: 768031dce91dcbe914449be8d62dc50549b5ae27
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/