Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2
tree: 2d76f6061459521a9232c01e2e5c78f60543029e
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/