am d3092c05: Revert "Fix crespo build with A2DP enabled"

Merge commit 'd3092c0553f488a478d1be4b82c97ce1e0f470d7' into gingerbread-plus-aosp

* commit 'd3092c0553f488a478d1be4b82c97ce1e0f470d7':
  Revert "Fix crespo build with A2DP enabled"