m7att: shift to common m7 tree

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