Track htc-msm8960-common upstream

Until i have something to edit there we will just track upstream