Merge commit '3964d4ed448b00791bc1b574913be24f44b45f0f' into eclair-plus-aosp * commit '3964d4ed448b00791bc1b574913be24f44b45f0f': Fix issue 2199233: ERD16 Incall volume with headset is crazy loud / volume buttons have no effect