am 7547b8ea: fix build

Merge commit '7547b8eac6a4011683a93f51fdabf5a978e1f18c' into gingerbread-plus-aosp

* commit '7547b8eac6a4011683a93f51fdabf5a978e1f18c':
  fix build
tree: ede91795990155a43d59db5a92bd0b56b9654eeb
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/