added m7-common fork from CM