Merged msm8960

Merged in msm8960 so it's no longer needed. Also make other fixes to multiple other files.