am e2cd3353: Merge "Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge." into honeycomb-mr1

* commit 'e2cd33531182b31e0ace2c3acb0e960fbf1ba273':
  Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge.
tree: 2169ee17f33ef64944087be8ce25fb8e660cf35e
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/