Fix input configuration for VOIP calls

Change-Id: I3804813c8ddf96543e4a702939dbd47365f67d15
Merge branch 'upstream/cm-10.1' into cm-10.1
Enable volume rocker wake setting

Change-Id: I6eb146e66e6e311415a7f3e0d9e273c299bd232f
Merge branch 'cm-10.1' into martincz