vendor/cm: We are at CM11 now

Change-Id: I0a4b4319506043cae16ad9b6ad360c06961d0fb2
Merge "vendor/cm: We are at CM11 now" into cm-11.0
Merge branch 'upstream/cm-11.0'