I merged a select amount of changes
Merge branch 'jb-kang' of github.com:espmartin/android_device_htc_ace into jb-kang