m7tmo: shift to common m7 tree

Change-Id: I66d40073591de6910823fedb49544ca9a93a22ed
Merge branch 'cm-11.0' into martincz