Merge branch 'cm-11.0' into cm-11.0-m7wls

Change-Id: If753857ea2bffd25ccd0dd2dfcb322bc1de554b6
Merge branch 'cm-11.0-m7wls' of github.com:tdhite/android_device_htc_m7spr into cm-11.0-m7wls