fix multiple dependencies, vendor hacks, redireects to cm, remove m7 since its not really a device

Change-Id: I1922811a29bd386178aaf33d4c81a52fabf71a3d