Revert "[TEMP] Squashed revert of everything related to msm2"

This reverts commit 887e7f6f211a5af7ec6b1f90dbb937395343fecb.

Change-Id: I34f3d6889fc80606250be031891108caa74f2137