Bring m7 common, m7vzw, and m7 kernel branches up to date