m7ul: shift to common m7 tree

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