Rebase Tree

Change-Id: I69aa8eeefeffa66627fe266488216720cd5668b7
Track Our Own HTC msm8960-common

Change-Id: Ia6e7d63c20ae060a568721c1b76ce3ccb18134b7
Fix A Few Things

Change-Id: I31dc2b01f06559fce0d1173547ab8259185d1ec9