split m7's

Change-Id: I31bdceffbffe317782d3ed4c1f907c5d80597a13
Signed-off-by: Roman Birg <romanbirg@gmail.com>
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1