Reconcile with honeycomb-mr1-release

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