XRevert ":|"

This reverts commit 3b26491b2b3d882e79d80d790d2bcc05eda0dcf7.
Merge branch 'cm-10.2' of github.com:nolinuxnoparty/android_device_htc_protou into cm-10.2