Merge branch 'cm-11.0' of github.com:Team-Hydra/android_vendor_cm into cm-11.0