fix errors
fix compile error
Merge branch 'master' of github.com:rastomanchik/android_device_htc_primou