switch back to my msm7x30-common

Change-Id: Ib334bd68a8165f9b48bf67d25569aa52c9988683