Merge fb474872 from gingerbread-plus-aosp

Change-Id: I1bbb845a86a7b7df44ea175df3af22e5f47c44e3
tree: 5ba561315eff765e4a434ae56c55c3648defe5ec
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/