Reconcile with honeycomb-release

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