Revert "m7-common: move common defines up to msm8960-common"

This reverts commit 7fa48a7399f19cb0dc63eef1f80474cbcac3d647.