m7spr: update all the things!

Change-Id: Ia8295a4d6c1adaccdac44f80af07be9e5c7395c1