first commit
Merge https://github.com/ajfink/android_vendor_htc_a11chlspr