Merge from honeycomb-plus-aosp

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