Forward port 'Swap volume buttons' (2/3)

[mikeioannina]: Adjust for 5.0 changes

Change-Id: I5ed4ae2b7e69e2ada067ed1d3524b3d3fad30e2e
Merge remote-tracking branch 'cm/cm-12.0' into HEAD