Switch the m7's to jb2.

Change-Id: I61b850a5bd2e5a2636c044b085e16e317f952dc2