Unify m7ul m7att and m7tmo

Change-Id: Iab2e884c8031dc151d7c2d7f91c412f28bd2b408