Cm all the htc8960s

Change-Id: I1358d27c3be6e7e557bc5209997154e73727fb3b
Switch vendor back

Change-Id: Id6eda3fb68c84606fe23a4531ef0f4846d7e5996