rework headphone switch detection

Change-Id: I4b2f305c166304ff85a93a964c276af4a4fa08ae
Merge "rework headphone switch detection" into ics