Separate MSM8960 and MSM8974 wrapper