Merge branch 'cm-10.2' of github.com:Team-Hydra/android_device_htc_shooter into cm-10.2