Revert "m7: move props to m7-common"

This reverts commit a0ef7f3c144b3d694960e10b245085c23b235119.

Change-Id: Ie59025d1ee6bffa603de07d2a14e905c940f1c52