Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0

Conflicts:
	services/surfaceflinger/Android.mk
Forward port 'Swap volume buttons' (2/3)

[mikeioannina]: Adjust for 5.0 changes

Change-Id: I5ed4ae2b7e69e2ada067ed1d3524b3d3fad30e2e
Merge branch 'cm-12.0' of git://github.com/CyanogenMod/android_frameworks_native into cm-12.0
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0
Merge remote-tracking branch 'archidroid/cm-12.0' into cm-12.0

Conflicts:
	services/surfaceflinger/Android.mk
Merge remote-tracking branch 'temasek/cm-12.0' into cm-12.0