track separate device and msm7x30-common branch

Change-Id: Ie2bb94cab68f26d45f173727a877cb3f8c50a33a