Update M7 blobs with CM / delete s4-common

Change-Id: Ib3012e578ccc2f4c2d2ad1965637e28cd50ade54