Readd samsung i9305 to manifest
Bring in Vigor
Track our own msm7k
Merge remote-tracking branch 'upstream/jb2' into jb2