Merge change I923d7d72 into eclair

* changes:
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
tree: 579f2ef0890c1595d9d164b6cdfdda4585dd1de7
  1. cmds/
  2. include/
  3. media/